From patchwork Tue Jun 6 15:21:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 771614 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3whd9F0658z9s0g for ; Tue, 6 Jun 2017 13:54:24 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 96D5AC21C4F; Tue, 6 Jun 2017 03:54:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, DATE_IN_FUTURE_06_12, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BBC84C21C49; Tue, 6 Jun 2017 03:54:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0199EC21C49; Tue, 6 Jun 2017 03:54:16 +0000 (UTC) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0072.outbound.protection.outlook.com [104.47.37.72]) by lists.denx.de (Postfix) with ESMTPS id 19C0FC21C47 for ; Tue, 6 Jun 2017 03:54:16 +0000 (UTC) Received: from MWHPR03CA0018.namprd03.prod.outlook.com (10.175.133.156) by MWHPR03MB2573.namprd03.prod.outlook.com (10.168.206.135) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1143.10; Tue, 6 Jun 2017 03:54:13 +0000 Received: from BL2FFO11FD049.protection.gbl (2a01:111:f400:7c09::124) by MWHPR03CA0018.outlook.office365.com (2603:10b6:300:117::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1143.10 via Frontend Transport; Tue, 6 Jun 2017 03:54:12 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD049.mail.protection.outlook.com (10.173.161.211) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1101.12 via Frontend Transport; Tue, 6 Jun 2017 03:54:12 +0000 Received: from b49020-OptiPlex-790.ap.freescale.net (b49020-OptiPlex-790.ap.freescale.net [10.232.132.83]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v563s8f0016655; Mon, 5 Jun 2017 20:54:09 -0700 From: Sumit Garg To: Date: Tue, 6 Jun 2017 20:51:31 +0530 Message-ID: <1496762491-15667-1-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131411948528273730; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(6009001)(336005)(39380400002)(39450400003)(39850400002)(39860400002)(39840400002)(39400400002)(39410400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(2351001)(106466001)(8656002)(305945005)(4326008)(105606002)(189998001)(104016004)(50986999)(356003)(50226002)(8676002)(81166006)(6666003)(8936002)(36756003)(5660300001)(77096006)(47776003)(33646002)(2906002)(110136004)(5003940100001)(50466002)(6916009)(48376002)(38730400002)(54906002)(498600001)(53936002)(85426001)(86362001)(139555002)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2573; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD049; 1:U0/AeDHLa3pAvGVBMbSWA0a9BpY9tNFW8EpiCoszc4/O47zu/zkGJOoVT3myiJraiKaxGgIRswgJuv6BsnhEk2zq+YPhVx/naaMzOEVKvZ1U0NpPVIsG2MlpCOON5O2mP5kpcfX8kxH3uH/8f8PQlZS6VmhEed9FyWMjjnLnJs1axPDeIodzSHE3kwsB71eDdjN9jt67fkO5W1fSQjTgEtCi5iXcjanT1jJlwPu9dY9JWrGQARNlJ2W1n+YGNGXkbi0X8DxjWwd3sS/smAKu4ATmPb5qSc3bSbbjZ736I4DCrMWn2xNCB36yVDBaUpoMXNBBNfJ/ShcPfCkQeaq8CWy2Fi0Wlzuy8Xcsy34DU/GQONmjXJq9Y88dPJ1W80haia/+UTRN9ueBjtoJ/6qerCDpJfgsxWoKxE6F1n8t7ZWv6A9ETwJRDvg6cVs9HHHrgx4RlwlzsERRZmcHhadWLo13IcZfNQqZ+vkhzWk4gVWR1G8hkvXrLxyVDZU0KAOmv2+PU51B8ego0UDWtDPFGKUnd383IaObRmjBIEbRMfdKO3RdGblfjcw1GbXl16GOCGFr1XxeB2NugZTuz7erLVcHDFHM4VofVLUHYwsxW8qvqm/eBNfDNxZPUv4lDLEV0Q5Ce5e3sfdZhjs6q4ngs5Vt91pi9MgX6r7forqpwvmKhu5Bmk3xhNZ3bohaZ9mm MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR03MB2573: X-MS-Office365-Filtering-Correlation-Id: 048f2420-2460-435d-a7e5-08d4ac8fb1b9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:MWHPR03MB2573; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2573; 3:U3b3q8dkUiL6QQVxJXWn5TWaAKydiY2eE1AYZQgEhyXVNMdgW1wTh5AYuBEX7PKY2U/TdaSEz0n13ia32V0ujcog5RU4+zed0rd7tHIBpkqAVrcVmUo/dLb6VVW6QIKVMpVWG8h0txr+YoFvhyHZGU6SSplSiUioXEY54JMdGK12JotEDLun7VICf97JMIYpLez3Zzec7fQjudlii+HblZfGWhQ8uxsFI6fhrLGcfOrBJXQwdEecXE5E6PdslUrDyCGSFvTSBbuXDxzjj/+ujrWXTZ9QONFf1BVImsMg4QLnP24iXyqGVEuxhvs/isKEZaeqPaqPwvg0YkGZReHKEnhU22+aJCBmhtX2814mrCxzEgTw49knHz7MEg0PQ+E6Obcd3aeTll7QipR4nzZIH5t/iPOsXfPEmJc6sl+wQU7QpZUav31NeGw3fhZu2y/8; 25:3WkCOmdOFxWsrZiHVKQdbBlS29zp/5ECjyP7Nt9JaX0DJVwVWFiNuS0Greqn9L2i4n3QB57FKkY+cXBqa+rJ8UixvMK/CLjivQvEC6Tb7kVR4AYm65IbHhi4BOFkZhZxjpzr0VL7M03F2otno1DhEyGxUx6utyD6LGaKlbE7oSzI1LNQNCEf1C+Qrr4e9aM6UketGvHN06weAXlQQVTW/6e55/xDA6Frfow32PPp+IZu6SIZdo/7Zh39IBTeZKmrVK93/jkfI/qw/gMV9PlvJact82Y5/KhgiSQJquH9cO0X2tw26eHf51EOPwVuG0hilqOQFnRehj6Mk6LxCqAU6Tt3b6OcYHH+yWxfrcYD89OWDnJYBX6hHYtCVA/Xk9Jv1x6yZvBliftB2hN5T2kh5vhUWhWoxjqE+qXqmQ0ybICVUW2gGUHcCpju2Owgbbr0/++TUtWmypJj1ohTAPJW82vpKyxtN6xrgK38QW6co2c= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2573; 31:Mc1M9hwzTlrR6Ej0KU5bUzMX66A/y4v/hCJreo8NIIOB+dkx8By1fJQQbeHyCefCVzlYyV2IF3/4fqTVQ0J4Wl9ADdQTVmjy/mmKUK+GEXTQUkLuou1kXDN+OW4toUCRypZoQjIKj18GsB0ZJWd8lTkTZjFCM4qe7EUMbDqTGw6/zh9y7Pkj8UCt+/COqy27ZTsQrgNb6KeluSQqB5S3DK3wxIgIQb0YRi3zw3uGGpb0ovrizL04Vg93Hx1Ttd+CguGIqhtQtFKwdDBVzrcuLg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(8121501046)(5005006)(13016025)(13018025)(93006095)(93001095)(10201501046)(3002001)(100000703101)(100105400095)(6055026)(6096035)(20161123556025)(20161123563025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123559100)(20161123561025)(20161123565025)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR03MB2573; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR03MB2573; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2573; 4:C3vNOUYOq05FLbjnBC+Y7scflK+4ql9faUh1jFCOTr?= =?us-ascii?Q?buIq27W49FUZ9pylb9iEU/NQTziDxMyKfSbw324PTwL6c1AhLRCLHr07/jfu?= =?us-ascii?Q?/fkoGjSiHrjtSY6AEe/6ITBX8ZFfzNmxl3ZLRvqcEUovz8vkqFOEXcCcQK/8?= =?us-ascii?Q?Pi1So/8QkWC2Cb9ZBU7n5ZV5WiQWFeALZk4sCELdGPQPMzmgrSylR+LM9GO1?= =?us-ascii?Q?rMDdcZGHA3miD9GMM1baB2mK/n4wAzwzQj8YQkDqf3qnN3+js2Kx1qCIKEgm?= =?us-ascii?Q?dTp8NazxLpLvos1+KRjw/u+fllL+CqZA3e5X3FOpFxZ9B52YQgZILdNg5h5l?= =?us-ascii?Q?DwcFHgnyz9BttifwPlV8gQTPxEiA24uKRaA85XVFKTBsfVRcshGd9llyqZLF?= =?us-ascii?Q?bFoq4k+eWvY64jyFBquUDNWTI31Y7quD00ck8uhsskp/csjFT5FrJGCN0mGv?= =?us-ascii?Q?7Xpx2iFeriSZhzeUA02EQfwhacXlSE/MQsdENCzeQaiL9y0UY1JsU1L1JXTo?= =?us-ascii?Q?Ww+Ur933N5sS3f2LDn1xQ7WYLd396kr0vPEJXNRoiligRE/d0oqwl+oY1qig?= =?us-ascii?Q?jVZlvXAK1Az6FUDtygEyEbmC7GTPVr6Z92FhhQ/UUhS5tL9nHJXrURr2BIQl?= =?us-ascii?Q?BBG3eEIu6EW7y/oLVrW/meLMUjC/p5kYBM1OfXqoHHMFUfopBc7cKHOd9D3m?= =?us-ascii?Q?x8aiisXKAJAQhm8EeAAVcM+0hGQ0++jE8uaI/jkVP+F72flJ9G4AQ25lkh3J?= =?us-ascii?Q?nRzupuQtkgTNoTM9e7aTfA37kWM0po4jHCB5hF+c4rweDKDJdT8HVLFjU12U?= =?us-ascii?Q?p2RQOHusRvdNpXgXmA1PJ6RycAssPG4VkDFPJLTBAreVcpJOjT0jss2dCMU/?= =?us-ascii?Q?Y8wM7Qa0bA3L9Rhs913N3/mz4yguAIWc6agjNfxxOnyI5krg7WjbxNJgrr1c?= =?us-ascii?Q?o1ViI7Gfoo7TbhgEsMP4JWBV/xJodBfE0q5upoFsH0eH015DDGVXsIwL/ANC?= =?us-ascii?Q?2ut4z97JXxCu5Ob3yzQPhH5sv4SVGhP948888IMPuYwM4vx7co+roC6k7V37?= =?us-ascii?Q?PJ+ENySJ2ZtcVrVDaKL/JRLXOuc8JI83wMmU9/7FnOsYH/lc6zlESwcVEV4H?= =?us-ascii?Q?lfkd0apc2qKh5xdKid+dg91jsX+9KezS56uOQR/n6qumfg+YA+B3KzDNmG2J?= =?us-ascii?Q?ze87y7B/0JG0w2YhztgpKzXdfebdQaitMTknthaBJKekAuBM8dFdbZGpe/7B?= =?us-ascii?Q?mmfPk+9bQZtPna5xZc7FE4V254qR6LL2/YNNy8?= X-Forefront-PRVS: 033054F29A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2573; 23:PBZ/MSROv4Cr/7+mRzkxOA2Wj2hiotEzY8u7v+iOy?= =?us-ascii?Q?Bdn103LDV8JzR8deKNgcY4xXesCkESWKsgWf2YjYjBJQ8o6RTV7b7ZaQwsj4?= =?us-ascii?Q?Kmy8fL/SCWAd0+lLHPNnYFp0D+ZiRToOwxILPEQBcYD+lznVJ7msLVyYnkaq?= =?us-ascii?Q?cC4/ITNwxDSSZTgvqndNq2RsCQ33K2AEk3gZyiqCkgnZ0CANVqFi6XUZWg81?= =?us-ascii?Q?QcCjRkNUwLGkNSH6cM8Z8FHa6PLIgwUWpNd+rpYthv7f70IBVyTFpXOeqezA?= =?us-ascii?Q?Zez+Fxmrkise5g2/jQgvWfJpDIY+VF891u/LJY5NwINMsnzZlO9d+JCBZJrw?= =?us-ascii?Q?YCQTMKD/KMY2Rw4ciGwZPBIbcbkhxGWd71hSQLR+3BoQ9akQ0zxE77uWK1CA?= =?us-ascii?Q?EMwraIqwvDVil+hbJ9HPdDkRWDWWt/G0TvfgytIOu7ey2l1VotdZJbofJwTT?= =?us-ascii?Q?CGnHpBLGpBsWLnJ2wtvt5uJKaoUBH/yscQxMshscoH847ThT94BeEI9lR4kq?= =?us-ascii?Q?OnnGT+7rhkcu7N7mduntGZBcM8bhtX5iRdqHDXOv1h6w3bSzpr2/XBdSRTzR?= =?us-ascii?Q?6bFyyZ8UTKukH3wT5Bc9RjNirg2ADqENiw40N2nJYdGxYUZRYzYGq0aH9HZK?= =?us-ascii?Q?ajnsiTr9nxnBnz11q1Gm9NnV//AFD6oD6NnN4ifESu34b6hg2XFoOcdZg+eO?= =?us-ascii?Q?3v6Pjf2xpgaNhdEIDPesw/OlgSpGHBW9kUtpq7EDD+ods19BGR7XOtXBGOZF?= =?us-ascii?Q?tPhWPEkNuUKQW5+eqHm7iuxd1NY3PGsqGMSHd2MGtr3BojPEpkmUwYmvaEyW?= =?us-ascii?Q?wDMusbHNdgS40nwCBgU2gzEWVL9XGQ4Nd8rhf8NDx3a28riCEptHwZVyJnDd?= =?us-ascii?Q?CTyz3PlAcCG8HU3n+KhZKO/rIE5H1wXtPAyj80+xGx33V5Xplh/tX83Jeubl?= =?us-ascii?Q?PWpFAN+dpASAoOYpoK9aoYgBiCtrLjuZSbOfwBi2caP57HbrHdIMIZqTxYTF?= =?us-ascii?Q?P1bkqJZwNPQsFcwUI8p0kh/uuQqhuUZzxIALpC/VVo++3r3Pg49LwF8WwkAA?= =?us-ascii?Q?LPakuhC8JT3zNIK1sfefIUcl7Qq6kX42HnDjeOX/E9EzHQ/HOXwcA6/aXOBc?= =?us-ascii?Q?WTh97lMgzz5bzRaS7+7J678HmLDDxkmjLoTCpyjX3y8DsnFgb2E8ria+K5JU?= =?us-ascii?Q?r30gTX4ptc5cwueQfjidx/9OZ4IM9TRYNWJc7uBlYV8JgHObgjegRWGZnlDh?= =?us-ascii?Q?J2WhiwZ1fzHkBUMmbfdLgvG794eTtVU7JnRIS90hV6fYEpPre1EnOKcxQKBg?= =?us-ascii?Q?XXvX+kzkjQ4cKMCf3UwJGM=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2573; 6:91gw9Mkznn7wytp1rp25CChb77hoDBIFV5AQ2RvZ3rjL4qPxOXCOX2xnWzPEznaha6oogdxF7D5Nsl0WY897WbvcjK1u2/4K+PHCQ/JpHfS0I3nfFoJW3QCWWiyx/LxzmvEN+X8mzb3PIC8RqVrVPSHZ/GuOT/S8Nnb+8O3l+TzKshhSYam2rANqmtrHWYgp6bNOpqqrZJEq9ph1KBNtpfHPAODpkDGeVO5d4X6YYlvwjkmHz5isxEyQr9qp0ih6OZT+gBtxpawUJuc+MN/Oib5QDvSg20lMMp0v0d6YvTh8IQp0qR9j3XN4wZZ1apabBlVyqcZqNYHnVkWl1f+v4EPyVwcS+9SY7pxuQW45gDPYs5cBPqZsfM5N2YuSPWPXGqJNg8HQMvD/LQRV9LeKnun7ZMCEypTaMDQI0Nq6v9oA5FfsOQzuUraC5xiIBHHrMqiCRx1qD63y+z5BJ4xPTYPjjovrjFUqwweo+cjjVK1m0ULrapfJm0wwB/DKLwaVL4nhpz/vASQKvdRgImeybw== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2573; 5:a+gTTBi8fc240WDidfUnhutCOM2jQUIUru6nKkN83MmKvN4oG3rFvY6LH5M4cZDdX6TrVGZk+Te1VDIMWzdbvKo0fRkpTWlXgEAvky6Sjh+dKaE9rkSUsvFJ9+/gMgpc4PxTEx26esJhRvLRd085eWsyaO2P1khvHiJ7qSn6lCMNKpCO2EieT8ojIGNxq+so82VdfbO2UEpCAPeYSuZXR07Osnlr+KGDk/ZGUwvVbrdB+BeTU4yP9fHG9hsQ8wp1B+K5mG9lvZrrm1DYwJoZfBKQa99s6HtWHtXzbek0Y0TPGx90Eig64YcaCva02+PVR8bjbHY7EbGcBgOfi26hnkrz5z/NchtE30Rg8lIESTho5z47LM0zHDBs+bVxM64m56ko0HeCNWC4XANyw7ERHZAdp2Cn5jK/WF2e0S3T0+p05ZPkM4kOqIJBZklCv6IEhWGoFY1rH4Xm8Vy2r++gK0c6rESIYuK1FXqAayAS8np8pciGZi2tnJBeTedEk8bLKLNDLLlQ8abFC6hk9aoXJw==; 24:vBg0sS995Eq+jYIOj58SljNI7RyRMTzaupergWzRBcXNy2r79yCZ6j94z7V651Tc2oimuq8ntlgkyPpXstl/q135clzKg4iPy67Cxms7SxA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2573; 7:6MviT0MUX2ydGeDl2mIjB/s8qvSaQlx0bGyFwkOU5hX+yjc+u+tkrc+mnBmFFCtGTXgB505bFG5DfnT03fqHsr2Vy2zDN0KAj2SfC7pcqyCzVEPHlNoB2OlhMfVGtJX3fbAw+/DWaQLNWvPEXwe46LvqpVqF2YGYJxmYY06B3pCa48zDMcX4h2RrTrrApK2DF9ocUH1YNXGhETv7jHyCgaOh/xmHQpwddKVEIjY6YYJBSMfCkgJcUhFjyJuszaPHe4+Sx4TCxBWSq7XgKEB0L4SlEdBEMbq7mShyI2y+5ictx5vRcXXsxfJBbnVAhgolPa5oVsrcWS0wpndd7sjVsw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2017 03:54:12.6557 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR03MB2573 Cc: alison.wang@nxp.com, ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH] arm: ls1021atwr: Add distro secure boot support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable validation of boot.scr script prior to its execution dependent on "secureboot" flag in environment. Disable fall back option to qspi boot in case of secure boot. Also enable "secureboot=y" flag in environment for ARM based platforms instead of bootcmd. Signed-off-by: Sumit Garg Tested-by: Vinitha Pillai --- configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 1 + .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + include/configs/ls1021atwr.h | 40 ++++++++++++++++++++-- 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig index 5b6ca22..9e1ab08 100644 --- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig @@ -44,3 +44,4 @@ CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_RSA=y CONFIG_SPL_RSA=y +CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index 783787a..af9fb9c 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -59,3 +59,4 @@ CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_RSA=y CONFIG_SPL_RSA=y +CONFIG_DISTRO_DEFAULTS=y diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 43767de..810e2c8 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -393,6 +393,7 @@ "fdt_addr=0x64f00000\0" \ "kernel_addr=0x65000000\0" \ "scriptaddr=0x80000000\0" \ + "scripthdraddr=0x80080000\0" \ "fdtheader_addr_r=0x80100000\0" \ "kernelheader_addr_r=0x80200000\0" \ "kernel_addr_r=0x81000000\0" \ @@ -402,6 +403,7 @@ "kernel_size=0x2800000\0" \ BOOTENV \ "boot_scripts=ls1021atwr_boot.scr\0" \ + "boot_script_hdr=hdr_ls1021atwr_bs.out\0" \ "scan_dev_for_boot_part=" \ "part list ${devtype} ${devnum} devplist; " \ "env exists devplist || setenv devplist 1; " \ @@ -412,6 +414,21 @@ "run scan_dev_for_boot; " \ "fi; " \ "done\0" \ + "scan_dev_for_boot=" \ + "echo Scanning ${devtype} " \ + "${devnum}:${distro_bootpart}...; " \ + "for prefix in ${boot_prefixes}; do " \ + "run scan_dev_for_scripts; " \ + "done;" \ + "\0" \ + "boot_a_script=" \ + "load ${devtype} ${devnum}:${distro_bootpart} " \ + "${scriptaddr} ${prefix}${script}; " \ + "env exists secureboot && load ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr} " \ + "&& esbc_validate ${scripthdraddr};" \ + "source ${scriptaddr}\0" \ "installer=load mmc 0:2 $load_addr " \ "/flex_installer_arm32.itb; " \ "bootm $load_addr#ls1021atwr\0" \ @@ -429,6 +446,7 @@ "fdt_addr=0x64f00000\0" \ "kernel_addr=0x65000000\0" \ "scriptaddr=0x80000000\0" \ + "scripthdraddr=0x80080000\0" \ "fdtheader_addr_r=0x80100000\0" \ "kernelheader_addr_r=0x80200000\0" \ "kernel_addr_r=0x81000000\0" \ @@ -438,6 +456,7 @@ "kernel_size=0x2800000\0" \ BOOTENV \ "boot_scripts=ls1021atwr_boot.scr\0" \ + "boot_script_hdr=hdr_ls1021atwr_bs.out\0" \ "scan_dev_for_boot_part=" \ "part list ${devtype} ${devnum} devplist; " \ "env exists devplist || setenv devplist 1; " \ @@ -448,6 +467,21 @@ "run scan_dev_for_boot; " \ "fi; " \ "done\0" \ + "scan_dev_for_boot=" \ + "echo Scanning ${devtype} " \ + "${devnum}:${distro_bootpart}...; " \ + "for prefix in ${boot_prefixes}; do " \ + "run scan_dev_for_scripts; " \ + "done;" \ + "\0" \ + "boot_a_script=" \ + "load ${devtype} ${devnum}:${distro_bootpart} " \ + "${scriptaddr} ${prefix}${script}; " \ + "env exists secureboot && load ${devtype} " \ + "${devnum}:${distro_bootpart} " \ + "${scripthdraddr} ${prefix}${boot_script_hdr} " \ + "&& esbc_validate ${scripthdraddr};" \ + "source ${scriptaddr}\0" \ "installer=load mmc 0:2 $load_addr " \ "/flex_installer_arm32.itb; " \ "bootm $load_addr#ls1021atwr\0" \ @@ -461,9 +495,11 @@ #undef CONFIG_BOOTCOMMAND #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) -#define CONFIG_BOOTCOMMAND "run distro_bootcmd;run qspi_bootcmd" +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \ + "&& esbc_halt; run qspi_bootcmd;" #else -#define CONFIG_BOOTCOMMAND "run distro_bootcmd;run nor_bootcmd" +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \ + "&& esbc_halt; run nor_bootcmd;" #endif #define CONFIG_BOOTARGS "console=ttyS0,115200 root=/dev/ram0"