From patchwork Tue Jun 6 15:20:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 771613 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 3whd894g6Kz9s0g for ; Tue, 6 Jun 2017 13:53:29 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 61288C21C47; Tue, 6 Jun 2017 03:53: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_H4, 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 F3D16C21C39; Tue, 6 Jun 2017 03:53:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 788D7C21C39; Tue, 6 Jun 2017 03:53:17 +0000 (UTC) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0078.outbound.protection.outlook.com [104.47.33.78]) by lists.denx.de (Postfix) with ESMTPS id AC74FC21C28 for ; Tue, 6 Jun 2017 03:53:16 +0000 (UTC) Received: from BN6PR03CA0006.namprd03.prod.outlook.com (10.168.230.144) by CY4PR03MB2567.namprd03.prod.outlook.com (10.173.42.10) 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:53:14 +0000 Received: from BY2FFO11FD030.protection.gbl (2a01:111:f400:7c0c::164) by BN6PR03CA0006.outlook.office365.com (2603:10b6:404:23::16) 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:53:14 +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 BY2FFO11FD030.mail.protection.outlook.com (10.1.14.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:53:14 +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 v563r9m3015517; Mon, 5 Jun 2017 20:53:10 -0700 From: Sumit Garg To: Date: Tue, 6 Jun 2017 20:50:29 +0530 Message-ID: <1496762429-15629-1-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131411947942744667; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39450400003)(39840400002)(39410400002)(39400400002)(39850400002)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(9170700003)(8676002)(77096006)(54906002)(106466001)(8656002)(5660300001)(105606002)(4326008)(305945005)(36756003)(50226002)(110136004)(53936002)(81166006)(86362001)(2906002)(47776003)(189998001)(85426001)(8936002)(498600001)(104016004)(38730400002)(6666003)(356003)(33646002)(50466002)(48376002)(6916009)(50986999)(5003940100001)(2351001)(139555002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2567; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD030; 1:Sr9OkwzTfI9xjwY3Cvzp8oZZt29X7twkUblohuvZv+AXqpgoC5F6uXxvP3ioZUeBrrloOZ2hR58lnFHLIPyMp1wt2bllLLxuOeFJaGVTbzXJ9w8yEppzAX8IHnoERinLa6ds1Iw+1yDqBI+4dBZBcAuejBqPflWJtD7FgOgorQAi7RYcsdewprHof6Mnr/Q28FLg0ccopjX35xb51Gc+OcG6/45gSJ8Rex74DHKw0g5M61fNxvxBU5NCaBmzbhM7VdOFgh/UAHM2Z0nl4EemWm+lUgbQyMt3uIy4Ht1axXfV5ywCJNAznfjfHt4ZRm4K5cafqySgeX0IGKtt13/Flcr/xeE8ljCLUiG9DoJF+Th7nk8ClGiH/pMhg3ksQ2bBj2ca0vcHeztCbyH+xIaVxgFFND1R5NRpuBvHZ9qgIvyNlVKo57+YLFQQ+0/93biz+FyaoiNp6LlXr2Kliu3ZUfbx8cIOSSizHZ65v9/DG/LY29UNsrpI6+iNbH3eq17TkwTCG+xxYZ+LHKVxv+YUeukr/8bY1prmzA0WFe2MYR+HZbOaHPMEbdXsRITqg8+YCqeDTBlYOGwahe/T6X9YG6e8SLLraFDhoFmtXhFWJdMJ1HYQe8KVXaFg49afKLzpfYLx3qZIEMpYeIuhpso9OMCAQaiRL9TF76Bv/bNBWckB5ZdmZMkvmf6bLK3kWxEl MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PR03MB2567: X-MS-Office365-Filtering-Correlation-Id: e86af5dd-91d3-4a5c-925b-08d4ac8f8ed5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:CY4PR03MB2567; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2567; 3:ZDwlL3jHGMNZAuGz5/6htqvGltGf8/8BpF5cqyrhzAfU2I1Xut0QTJbYAERphmG2Ph8SyfGMBcuDBc9kF7IH8rUhvk2xhssTn+Uzlt+LfQkz5pb9xee+H0ogv5WhavvktWjdsqkQ9HgDJj6dtTv+BdRtdFr2Y/tpzFMUHJb0xJw8pJ5rN4ea2DBpvDCna82jdnG4F2YoKlF7cSfQ3pmUrjEIhJ42yBiVka9llcVShxPszsJ/S5wjKrPhF5jajigQUDdfHgYi9khoAyS/PZPJsK4RyMhHUdS7U+Oeom7vNmlRaGpZ5QOObKOvQiyFF4/59wJFVDmf1M0J0cFcFUhRo0U60cW+eVdNbuJO11KR7wHtOnDD8jH1Jy4qRlwfMep0o2vVPAqGj3aNo4vVmOyVKiXiuqe7FerJ/evOMBB9BNNxJ+pDxQ5yCht8RghW47zS; 25:QMROeOCafcCIbZTGkugYFzjIbzTbwsEosDtlELH9c/vI0VF2ModCmCq972ilh0SjLRFhJE8tEPtqb4nUdQ899OxocxJieKjBc/arj9e7RAMgeMzBsJ+9g33gLakHIGtJIN8KUbLTJ4PflyrNfwrAq/aiSDzhwZMFVAvWdB6BmGpz+Qym/lifcX//XKXL0QVL6gWxIT2TqZYkfjI/N426O2bj55Yq/IspBjF/Kp6uJBnIyigYeTCMaGgn9b+SvyCnEByCYmsPbwMuTnxzKvVjwLG5F/6C2+pHvh9IecXjQhkC0Olb9ni+uuZlfAqlsBXHqplHMg6bxotZLilwdqS8HnxneYjJd58edZYF5WeerC+ElSgV2N5K7cbPMYdWehJfQuRZLAZexCss9WXNUvnRZjL1zEcAtIf/LBK5J2zqFIOcpxqqIySFXsPj4RFsYyNdo3WHBKzJSopZZlzJBCMxpmvnZJn7XQnScgbcva8CQ/U= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2567; 31:bKJfQIBoROANeAP16bV2TbhHHGXHjGyYhoN3rtEHs4g7fAmxpWYRy/OEefoZ2qu+wOmWD/N9fGnMV6fdncSQz8FNsx1Y3iEhPHUY+VCpuS6RpCGbvzRDvSC1WaTAP771squqNv5Icpq5DeUdF+SjNjPkApUaDLVRhkmoIn8r7u64G90Q3RgV8dC8qyBeiqCvgMUVvyC08Uy2MfyBIVZVnZ5nKXwhrq0WeKJivLNgNXg2auBnobky5yKFut4exxk0 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)(5005006)(8121501046)(13018025)(13016025)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6096035)(20161123556025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123561025)(20161123559100)(20161123563025)(20161123565025)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR03MB2567; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR03MB2567; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2567; 4:X449/4FDgJr6RbeWP+QeDHgaCJR4q8eL7nivX3gVL7?= =?us-ascii?Q?h5uzebAsyG4Ez9KFHWujf1IfNsNlSCJhNOcWJT1ny0YpTWv0uO7BIzGkDVAt?= =?us-ascii?Q?PjKYY/hBgQUjc4B6r1OswTg1ahEnkFIPCTBZpNko63CAdlxquKBiKD5k5w6i?= =?us-ascii?Q?E297HgG/JwrKVfYjC9X8+Gu9JoC7SYlMoSkKltBauZcxCdgwBIBqdnpAzPCJ?= =?us-ascii?Q?IpOAYWZl7KN/ocSkVTnRZC8iCtw/j1QOlJZWAkTGIKwojnWgS3HnklW+3uUo?= =?us-ascii?Q?U06p1EL9mfjBJtuswzH/38w9Z/bfJ3I7gX2yinX4dmVTzHKOqLhojKlfs1Lj?= =?us-ascii?Q?RDSdsHiYGez39QTIm+YjoyBqat8sHZZzZSVm86yt/En/Ez1OfoDp3FR+0xE4?= =?us-ascii?Q?fzRSRs0SJSChKrM6lWElaLZc94YUAgEy2LBfUCGcgsFs4PkZ0k5LV3KdeKUh?= =?us-ascii?Q?dzG2v+uaM5pKfyBQKkYFx7zt1sCSDrtrI8Pycj/k7/tCIS6tCi5w16q66kDx?= =?us-ascii?Q?WEPhsRryooGpXVorVp/6sPGXfI0L4nAkMISfZiJhamkw+LuFeaJ58koooVWO?= =?us-ascii?Q?pelWAYbeVTye+jdLywDdnWTNOsLbkej7B0AoD5OCKHPLMPdpCJUw/vMQMC5t?= =?us-ascii?Q?fH8AZDgn4TeufhRCKbf4tni/yS0Tc7LdbAe8nl3jQFmeTqUyx3ntZeTRlGHY?= =?us-ascii?Q?r/YHQ820EWRCK6KFjIWYDmR3H6Wd5KDlcbai41dgPGPNfOMARqOLSUkHfKC7?= =?us-ascii?Q?b2tDMmQ9oURArwYABpd1s+8BTzXIAzFQ7CA6HjTkXTNq1z+AUf4d2AsP7NO8?= =?us-ascii?Q?zy7OxsBuO4ou3UV57+TFh+0QYKYO2qZ1173nHN8CozeQPYvOks5U8C/KaSVS?= =?us-ascii?Q?lrQRPYcySJKgLofM5wpCr7B5dgjcjoPbxpDw76k0lDQBoUQ9b8tqixEZJwty?= =?us-ascii?Q?b5NxGGi+a0ZImzcveD5Vo8TpVnwcT7XS0VA4ux7Vz2DaQZ2/w4HpPuSvGI03?= =?us-ascii?Q?MnFkfdpJX4pHdWx/x6Fp6o5hWjQ2l9aeqFbAuMj7vBhfQQ1JXYIArxnFcDuU?= =?us-ascii?Q?rEAeiG/AmngM8QKOr/hy1plyabo0u8glBOe9FdN0zOgQOokGLj8f1eApmz9l?= =?us-ascii?Q?hlxNTCKh8xSkkV4ePzqBVmF/ZgpEmMm+MNdFzesS89BCnd6nrJ5EEttO6WJU?= =?us-ascii?Q?wFM8vKi8H7eYp0VhOB/tKdcZdrX7FU6nNkebB1yhY7YXzZsjCq/o+pfZTeVv?= =?us-ascii?Q?piftEZJ0dc5+Wee1Qtnb6c9Z00BJLvfZOq7dFN?= X-Forefront-PRVS: 033054F29A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2567; 23:t7dk1J47uCKMv6dB0+FVuQ+1LSKwoSrxpQEGq97pJ?= =?us-ascii?Q?cLrrtdJIOsyNDOs6GKSE0a6g6qI2NBWzC0AV63tnbuK+P6nt3ov3yvEVmETN?= =?us-ascii?Q?fAcX6fcQlrmlnWIE1gQDFNJSPI5C4Pq2dn3qWWGGQNo88tiBr3ozrRK5YshO?= =?us-ascii?Q?5vuiPmVQA5AzjLA+xcp7mZ3J7NGWuOq+Sbww9UUDM2snl1TzTTtzIil4nxIi?= =?us-ascii?Q?RiwmNf8D4j4TOO9hu9bKub5ghQ/IgIQ5qEVzcriBLp/zhFnOdDKc5FD3mmXC?= =?us-ascii?Q?d7MY+Og7Eb0odsMPnxtjqgI9CEe60uinioNIzk04fCANuDXWCNFWdj6XNpAA?= =?us-ascii?Q?a9a17P+0T/F9f47NpByBT+2BbxcFuw3J57OhdBKfat4zqEdl2uoYIq+QNAXo?= =?us-ascii?Q?4RCTV/h6EAppTBNXZaR/Z01yE79I2jjCKLRDsFOcTVv9WIgR/A58YRdZLG6t?= =?us-ascii?Q?zvmvPsd/jh7BgyihFGAl/MaYkRCk1biz8CWtOq3HEWluYxLqpehyLtsed9dk?= =?us-ascii?Q?cVfu9dBIilmNBek790ttCf2LZ0YGJjZ0zvptTnvfgvz7oxXApqCoirHxU7tf?= =?us-ascii?Q?AZtn7Sz/AbWevIKhaaQi2TPhOO+xukQ+Au9nulFsr+cBs4xsffr9I/U6weFP?= =?us-ascii?Q?v3yorpBtSIsc9YH9AGiseVoxaDuE+2mcYAjD8qSO0nm2nBE6y3tQZ3GJLP3H?= =?us-ascii?Q?dEHkMl8l0PbA4SybtXNG+ITBM9Ztmh5SyJnsumO3ooM1IGppKDu1OsWY2Z9K?= =?us-ascii?Q?9VFN/YQEi2D0V69GO/QGflWraasdsU/gL5P9It8lvfzhr7bxRtdJT9qkcVPr?= =?us-ascii?Q?XIvVSHQdcJFQ+AecLAj3BCXOZbTYWHJQg36aG2x4j5dvBonAHilxiTYeVyRD?= =?us-ascii?Q?uaRrALXlvR2e/adpWKTyOyyj2v16CH4fzc4TPASUi+sFjBM2noVhJ/2pBAjl?= =?us-ascii?Q?Z8WvqSf6MH+4Y/esItBEZGdhLOLj8ilwBIom9B9Tsp6DyK4WBY8ntBLXPzUx?= =?us-ascii?Q?fsgh2/pPxzzNHDIZMu3rNVT6A+BFGWoT5M2germP/wkWVb7AOSj8v6hY9F2z?= =?us-ascii?Q?pGf6Gaf60ISuU3dYJ8gkAc9Ck0advkx6C/qyV0i1kqZq8YuG/w0xwK6VZDYf?= =?us-ascii?Q?bSwSvWqLZo2uVf2sx1z0xM9IEuRsJPNeDxklrx54P5pYt0gtjUEbbXhCJ5Xh?= =?us-ascii?Q?SDS/pDCrs9ug7zCE/ke+1Xelnb3LsWo3v+s?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2567; 6:dzqy8ewW7Q47JCaJfu2gEqhiwEhj8Fl8mlPzWPgGGeX2tuPHiQtF/zLJ3hqwNeikDKRBJN6jOkX2I2CT+x7XR4iHDUmgyWJAnQXcx7ZlMuZVLIMbXZPeFKSoS2h7qDGPqELlUDPS4Pt3DYRT3ed2eTIxc/YVFms+nK6JICgRLWQ4xVXSRQN+f1zAUMfK6l8zusGQsUWtvrydP/zmqIxwOaieLHrsS/og9GWwcGPIQ6A9UHKTFln3poPdf1K4pfDwovTtV28l/MJ8d16nW5sW3cVvvDrM9N4iOud1RpmjWp8FTeetuO6oTzL1GC+jygQYB5Gu22FmkQ1mGwYuTv4EiUsfvC0Vr/8XpHecZ9+wOzW6Cq6vEOudcTKfcD/ZMfJQLte2KpeDQMfh3O17oNf3a70TXR1b6cfX+t7WaKyQnvusrwSws0/jpYMlDGzPVi6/xkco7G4Xlt9m3oRjjXQeNv/5exb+EwqmGQfU1hX9BTrmLJZcfA0ugwGjmgWY8jVa X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2567; 5:nUdzIfFYfC4SxzrqUMlGHuACMdv5Ghh45QZjzyAuieToO/MZqTeaPg4wiEtuUXjDbpmqqqVG89+ah0XO2JQQeVj2O3ultJkIKSs9acfpCKdXmss3BuYK+wHqNap6APGcEsYw2YfMr9rYXZFHjwoT5Dy5zn/yppQkkdQ2kxiEs6pP8MQLHKaxYlFp9nBNtMiDlCRoUR8qaeCOnqVCk2eavyQC9Xruk8olgCPQx6SydKqC50kGXP83YGC2dxIk4oXD6Z48bQc5+THac3eh5W9BVvtCC7sv3EYhYtbYpH3ftMbnEhugqJ9pAjSx+k/jAz1MbPxRghbTgMvQF/hSDB2n/a4gmIwzdAqT0QlZGeCvSRL+fCdEZ7ahqkuiqJGTBrZnfZoKWNlGFwmF0onaR2+7IbCC041oSootPWP/HTBTXPaFG/uPiLzwiftymmrPfkjI6Q47X5ZQ9Pk89qSbjrxfxcBX/0/iqtivp0iDLx51qlGEwqHGA5beRkIr5kcyBsguP4FGlCbJVjrM01/deSjOcg==; 24:zFKNVwtDWDGdAC9DmHNVsXtTsL1+DWY4DLpHVwpJljX+pK5Sr9VfFRFGUX02do4CYtluk0Xh7gchSdcjDXEa486icfuGmPXuFpHeT25PAUQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2567; 7:3+Z8jm85dtd7x0HOr2ZwWxDzDi92rPjIsD4gwCXaRgbRWcdn3A7Db0V/4N1WwWHCBY77feW3DWUFa6aN09U9jJgQCJa28LxY1CaNdnBUlU+qhzsK0uO9tcqniWyhpfkMg0N3AAl+tpmR/Ktfa84p/GJZSE3P5iU2IwPE9FigdKTyt7ERYyC9PxwOSlxleq7nCKNrrHQYKaiWZ0vrHsUQkHt9uJIscpm7fLoQYR61ZlkIycRdhdQtjXV3Kv2mf8smmRD3/y0k3Ss5xJoFnK7bJmCqORc339OsLHqcZexrAbQKwD3S+bB0r20jqJvcFEMmcS6MKODHcT0cR+3owmNGWg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2017 03:53:14.0872 (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: CY4PR03MB2567 Cc: ruchika.gupta@nxp.com, mingkai.hu@nxp.com Subject: [U-Boot] [PATCH] arm64: ls1046ardb: 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/ls1046ardb_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig | 1 + include/configs/ls1046a_common.h | 18 ++++++++++++++++++ include/configs/ls1046ardb.h | 3 ++- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig index 07bf17e..b7d8aa7 100644 --- a/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_qspi_SECURE_BOOT_defconfig @@ -36,3 +36,4 @@ CONFIG_FSL_QSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_RSA=y +CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig index c676266..0dd69c5 100644 --- a/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig @@ -45,3 +45,4 @@ CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_SPL_CRYPTO_SUPPORT=y CONFIG_SPL_HASH_SUPPORT=y +CONFIG_DISTRO_DEFAULTS=y diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 1820f34..053b759 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -223,9 +223,11 @@ "fdt_addr=0x64f00000\0" \ "kernel_addr=0x65000000\0" \ "scriptaddr=0x80000000\0" \ + "scripthdraddr=0x80080000\0" \ "fdtheader_addr_r=0x80100000\0" \ "kernelheader_addr_r=0x80200000\0" \ "load_addr=0xa0000000\0" \ + "kernel_addr_r=0x81000000\0" \ "fdt_addr_r=0x90000000\0" \ "ramdisk_addr_r=0xa0000000\0" \ "kernel_start=0x1000000\0" \ @@ -235,6 +237,7 @@ MTDPARTS_DEFAULT "\0" \ BOOTENV \ "boot_scripts=ls1046ardb_boot.scr\0" \ + "boot_script_hdr=hdr_ls1046ardb_bs.out\0" \ "scan_dev_for_boot_part=" \ "part list ${devtype} ${devnum} devplist; " \ "env exists devplist || setenv devplist 1; " \ @@ -245,6 +248,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_arm64.itb; " \ "bootm $load_addr#ls1046ardb\0" \ diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index d906be7..88bfff3 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -241,7 +241,8 @@ #ifndef SPL_NO_MISC #undef CONFIG_BOOTCOMMAND -#define CONFIG_BOOTCOMMAND "run distro_bootcmd;run qspi_bootcmd" +#define CONFIG_BOOTCOMMAND "run distro_bootcmd; env exists secureboot" \ + "&& esbc_halt; run qspi_bootcmd;" #define MTDPARTS_DEFAULT "mtdparts=1550000.quadspi:1m(rcw)," \ "15m(u-boot),48m(kernel.itb);" \ "7e800000.flash:16m(nand_uboot)," \