From patchwork Mon Jun 5 18:21:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 771097 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 3wh5D26Kpqz9s4s for ; Mon, 5 Jun 2017 16:54:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 7E69AC21C35; Mon, 5 Jun 2017 06:54:52 +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 ED0CEC21C2B; Mon, 5 Jun 2017 06:54:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D7BBEC21C2B; Mon, 5 Jun 2017 06:54:47 +0000 (UTC) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0064.outbound.protection.outlook.com [104.47.34.64]) by lists.denx.de (Postfix) with ESMTPS id D3728C21C28 for ; Mon, 5 Jun 2017 06:54:46 +0000 (UTC) Received: from BN6PR03CA0065.namprd03.prod.outlook.com (10.173.137.27) by MWHPR03MB2814.namprd03.prod.outlook.com (10.175.135.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1143.10; Mon, 5 Jun 2017 06:54:43 +0000 Received: from BN1BFFO11FD030.protection.gbl (2a01:111:f400:7c10::1:185) by BN6PR03CA0065.outlook.office365.com (2603:10b6:404:4c::27) 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; Mon, 5 Jun 2017 06:54:43 +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 BN1BFFO11FD030.mail.protection.outlook.com (10.58.144.93) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1101.12 via Frontend Transport; Mon, 5 Jun 2017 06:54:42 +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 v556scti025107; Sun, 4 Jun 2017 23:54:39 -0700 From: Sumit Garg To: Date: Mon, 5 Jun 2017 23:51:51 +0530 Message-ID: <1496686912-13519-1-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131411192830291570; (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)(39850400002)(39860400002)(39380400002)(39400400002)(39410400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(85426001)(86362001)(105606002)(189998001)(5003940100001)(50466002)(2351001)(50986999)(48376002)(106466001)(5660300001)(47776003)(356003)(33646002)(6916009)(6666003)(77096006)(4326008)(498600001)(2906002)(36756003)(50226002)(54906002)(8656002)(81166006)(8676002)(53936002)(8936002)(305945005)(110136004)(38730400002)(104016004)(139555002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2814; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD030; 1:GYrKnt3PBpC1nZHYoZ/ph2EsRmWUf0IGxOPCnzxSNQRYx4XHCWYOaQWpNeJPn4xCblBo/kbh+AWQ75lU+0HQb/Jn0yj8XwmuM7xTTgr15JbLwjygcbplOT4BIWYuJKm0jZksnc3aQvhvXSLGbKaR5g4St4QaO3hwiMXX2I/H/MaiAxYvNckF/zKyYsJq3fFFgZrBz6sLOkr2QesepkUJsZ5W+nr6VH1BPJf9qv02nKWOUVxhR8B41WoY0y+7QM1df/58EqMDhCL4T18QCEJdRxbRA+hXkR5V83HGnPJ/IVcSx0jS/Ab544nribZAOjx3AmxnX5o7FAPa1QC6Gc0U0aGn5KQ9be5QUjQ92iqXNrgEgf8ZndxBejR8zBQr2uey1ULbIU9nWLTULbiwgEz+u+B55HvxlM/tSIcbndCXzi/1MLE9kTUauPC12wVS3HghiVy9C5mbMjKEZ/OpDhqGt1guMiDVJcULPi426O1bnGz+kFLxwca0A25HYcWzcYj9nYLNvddNOJmoVpjYYab5e14G9okDqTnkKr+uBr4hrsZVg3yBb3tw6gD1ndTm47W0N+5x70JJTIma0e2rlHz8xLub3TXr2ZUpiknnyUDZnRsT604M2Eni/+H4QhfO/hW1Psez1tLiPexAB5z3Z7QmAcKcp16ajBO0PQE5ettPIn0518eTKQMa2FjqGQcW+yE0 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR03MB2814: X-MS-Office365-Filtering-Correlation-Id: 994c6909-ca81-48f3-ee72-08d4abdfbe9f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:MWHPR03MB2814; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2814; 3:nx8I+p5nrfvlpOKdW5XKkOOe8aoS4c0UQD7yvLVIekmMZgEk9ZvO9wS9becYXxg+qTg4SgMye6O6pA3wx7QS6slo3UgJs+0tcjmA0FTdLQst30lNbiOqQYkev/GGKc+L5MTD/Tv+/y43RXOeUaDka44P2HF+k3iMpAO7OUTUlI2McH/AOEcXeUNW30imdwTV4ykEUDIrA5skiX9Md+uoDIrOBCrZKS4i/bOZnytJUrzgjWFsZFhl4IRdi5ns0XV8IWH6lrXIVrnHtMQ8M9lbY3/Mq62dqLZRbtRSlE9tjwwbTeAkivH5KiMGbiXcqlD0hnwOIRPqLHCs/sjNMV8L/tGUP+jzlYV+C6IHxp48+NkuLU63PSHfbhhqCpef2/AqPbxipAqU5qH7O68UQt7XHfMjLPIobY5DoP4mAlh2f4i4mjp4dqbilzIcjPuuUNDC; 25:Q4R7aTXguEj+ssi1mRDa0zloQMy8o1TqR4y3gliCrwIiSpIrzQDQFs19XC/GYFYxS+EO5eUzNG9kV2yTmywZ6+7j4Wl0ffMKc5JEzQmFktq2QZFKH8pyT+8uH9dXhBPvQ8PINqElx3rPONX/Pk+j2FNCHxTaYnCD1ufx6AMs9uJyU9xI7tR3+rVsXocuswVD01W5yRGY0X/Ic4gWT5+B3otLEZA2uFSW8ECT3r63TrpjNTpb1IEuOF0+1yyHPF3vD8N4qXLB0N32MkVXFzYHQi7ziZuv40Fapnyv5B8Zdv0F+HXohkxfyS6rmv+iwCNVheDjaJLe3Y7qiIzGB/maVfaMva6OViO83QVca2XRZTZWQOeHlIPqhvG9/epoKGBYfEjvBJbuJcJ9rNMNavgiu0ROA6N1OvluUBvJjlR98nxvbGs3p+XNHwhOIUbfTa0wUIR4WrWLyCbj21XLRjp7eY0lQBXYpj39E75jevNLiEM= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2814; 31:s7PVlliL3KXcQC8tVUAuKMPMp6USsNKjFV7+ZjG4iu6mfmwZYLMP9BOr4ptGU+FhlY0z7fDvXslXBe2l1XjYQK8TvJFcTJYUqlq5ZARwfvdxXD94vYyEsD0FQv/Lt6C8XpwCEdGGWOVpjfZ+BYpe2gjMmh3EEMpEBYnSIFGoME+qnC8ulhjMp6HJovDo69mlt2YHB/ySBsubFYBpcL6gbNMboHM57oj9Re9/NyYpgIUJx6QpT0mN6dnzGXnmlv4P1lvY1XGOdkO6mOi731fG8w== 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)(13018025)(13016025)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(100000703101)(100105400095)(6055026)(6096035)(20161123565025)(20161123563025)(20161123559100)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123556025)(20161123561025)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR03MB2814; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR03MB2814; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2814; 4:zLXzY2POXmgnLbuxRD8B5gWrF1zUveW0yP1S3WI7r/?= =?us-ascii?Q?iBDZHT6soGnuqjR8p4CkbpXblzU/mhoUsBansXe4gjYJHcyV3nDD5TJvvQ6g?= =?us-ascii?Q?0zIUQOoCLyhYygE0viSBtmkSQ0duSJwAgaDSRtIzupdC2z5BhBC0pSxeuEH7?= =?us-ascii?Q?ETjHnng10m1KcCdO7JyhIrpOelZP/inRy7k9eZ1IGckOO1cEGdQzP/ukppQG?= =?us-ascii?Q?AsqTZDQV0q6nPvQqeolX2/w9LUuForFbjpyrmVjDq/A+l3oYNZadlLU36wTk?= =?us-ascii?Q?esZJGnBaGSjQRCe15IAx/T/q0gSuKRvxlgCk6HulK65q1DTh74ljKhHeWylv?= =?us-ascii?Q?C95CZIL/K3EyKARlomXPdj4B/qyEVL/D0307bhAqBfM/pHqBq7ihslvrhH+/?= =?us-ascii?Q?eC9Z9d/auQd9eGbEs+ux8dWVX8RqK2GmuAY8FBgyO4XO8c3O+U8jeazvtmk9?= =?us-ascii?Q?UkvZMKOFBZDbSVoVdNJ4DfWV0RcI9kyQj1IxCCwKcnt3I0YVei+4TPHsgVhV?= =?us-ascii?Q?WR2s6b8tJkTchOSzEekxxcq4IYV1kUI8/7c4RCAoqbSn8vpPIkm+ltwl1V86?= =?us-ascii?Q?oqUT/hybOgef+up1Vu4soRA5YFe7AW/lV9VjtdSvt07HpTNaZjqW0kXIvEd3?= =?us-ascii?Q?ShiL4yZ9wDfkYZ4pVV4KAi7MmYC79nsVJpJBti322SgnCqHq5iz8t2W3dFtm?= =?us-ascii?Q?3ZK78+jK6X2v9ah4+m9oCPkOPFebnqT8vhDKIhLOHJcam4H22hvBJ76dFrIh?= =?us-ascii?Q?x2UHXkkz1U60bFUtMHcH8GsDd++RbNxZUtLzU7Mjyf2Snp0jiiMGzpuNXdwg?= =?us-ascii?Q?PkrJliy/T3yR+wgjjxOvHWqzWf+U8oJ8u3Zoa+z2ZcVEd5XSKzNn3IfyUa/p?= =?us-ascii?Q?F6AMFUrixTbzZ6KMz22KMxMHEFFILMgutPVF8KYSxDyj7wSgz28LDpywJ1oa?= =?us-ascii?Q?1GryTt0555E+qe5wnr+XIQbQTWTDZQ/4bhzaDlwA0VVSWdJegwJMNNtpLrhT?= =?us-ascii?Q?DldLm0UNtgeXXnB3BqSQfQztuOlDi2GiWxjPJLSVLRMwNTCn45fDaOsU+Sry?= =?us-ascii?Q?QUlbU55L7b1PU5J+OD6QZhUomE10CLwV3zIUz3SzUnjZYUJXV8xdj+Mjv4cI?= =?us-ascii?Q?g+3qeMI/qzVknMI8YJAafRO56fIQPlvK0OZQYLFqYHIVk7iXAPVp4OUlAi4C?= =?us-ascii?Q?2+DmrhAtdxPknKKjdHB2LvuVu1wdQ+cr+xjpuj6jwxX2flvz1BYwh1UBGPUJ?= =?us-ascii?Q?6gekB+Sv11Fan8C+OLuYURC2V3OX7eZoQo9GPn?= X-Forefront-PRVS: 0329B15C8A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2814; 23:UOaQiMW3gxCPEVMCPZUaStNz2BRgWhNpHmjf0MVrT?= =?us-ascii?Q?54j1BzCGpmw40oMBB6bHWYBfVkIy0CNR22G0Ux1ggUAYKnxaE2wR/iNLeFVe?= =?us-ascii?Q?ogeLExIwWLdpe22kkE+RhIUP7YW4hW/c3xjrnmLmM9LSFGPl/FUk/FSLo4yS?= =?us-ascii?Q?8IThuwvcT6U+FTl/or5vcsatXMmCPLk5kbJEMzul0XgFlf8urFQ7TxOigzW7?= =?us-ascii?Q?lB2r4F2iCHZjxnmkn3NL4d5VSF/I7RLq+WzqBzLD67QP/Nj7NN2fIMG1exWo?= =?us-ascii?Q?eBL2ZoOkjUQu5LodzGTikqcSaP0e7/ms0juWj5VuhZddIzo2fh7Qc0dLBZPX?= =?us-ascii?Q?Zk/W3lgmDFEHNE1nj/Pum5RZjcMao/VnGxArrHaGUF5agYNCNAiTVaGNJMWC?= =?us-ascii?Q?vYdSFUVd7NC2AHjQt36WIaS5D4Wd5EAyfevItFTpK2SUqymra/cDWX2QlUgx?= =?us-ascii?Q?aBg3qSKucmTuwngmyB5ZkOZ8fTgtwDqRTAl5SWFU4HZ/y9nIip1/oyu9gI38?= =?us-ascii?Q?6K5aDZa1zHdcqPmEsFX0eRK1val+194RynPWIqiZy6172xbtT500u0YjiCD5?= =?us-ascii?Q?GhsrtkcPViw1KL4Nm3X/ZCk2jv2QUY/t/5QUTJNX++YMQA2LEFpGwlOWCy/J?= =?us-ascii?Q?iWqyDQ12j5O7dc+urIXnBYWhvTy4tbREXXW33yycL2XSJ23L8TL0ioslbI+g?= =?us-ascii?Q?KgIpUyJEPiArDQ4erutgjHI4CPaoP74+MJ+n75opItPUrP6/FCrHclbxPZwg?= =?us-ascii?Q?zUrUpFEWTGvadCZH5DzjhDqiO4nqBTszAex14aqMrxfRgqSq+GapsEPpH+VI?= =?us-ascii?Q?AvjtKzx9h0IS+3Vg+izGALFQhI8bZU4dPBNRVOACIl4Y4TRLLeLzChKnWu5i?= =?us-ascii?Q?igHFRSsiqLQISkQSON8CPkUWTSgyt8VS7ivIght2p00rGP359kLQ5L9s9LBT?= =?us-ascii?Q?awnuX9R8iBnc2xIoXMEvjViK5GH1Ixyt0IEz8IS2p31tsPwmPwdl4oGSzcf1?= =?us-ascii?Q?sNci/vuyd6wHleD7NBHnZ88eWByMlNd5+dJreMjqT2EP+ax59k8mLPI4SoLU?= =?us-ascii?Q?AmizWgCNw0tUICxyqfjqMUDuwlnjbGaghx3HzD1b/JxEgqEHg5MosxfMK/mQ?= =?us-ascii?Q?YZZHrpficXWH0Ac8H3fVCYWb4hZUGigPyaBcDSO/nMLuepOw/vDytZYy1CRr?= =?us-ascii?Q?qVQG7ZAOw8+o4kyAcLLFHXp/kEypV00F1Nt?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2814; 6:iW2h4NakGwijMsYSpjHv2ubE55nAcMsQ0T91GT1w8HE30QnkEDWoCOI339Rh/E2fZovIIszE2pY/5laOUIXl5uQVYfw1OZ1XHUdprNNy1x+0xOtQo476atJVS5blUHoFwpsmgdflMOVTvENAa3FoW7MX6l6GEq3AFoPFYm1n6HJpanBwu61PgluOxI4r2Kbgdz9qjc7AuNdcKkj36RgCNS670v81BV7jfvhIx2Akcb0QSxvNxRcJ3FqIXUxLLlB2wJGH1aZWhnfVYpvWlj0lFgQS5nYERU/UJ0S2Iit/8zqnFCOkqzcm7QHy/GpC+2YmAZP8Gcf+UFoKHxlqZbSLSl+XSpISNe0qEB2N9bfZ5D00eZX31qokpOMWjRGNap/Zk03H95VLV1iJeYhwJfv5CPIWL1lEZ5F3X4kSQAHLRJ2XeUJyUoXtjVzpHBpyBMZ4IhbY8bVgSjHxnfr4cMKRYpAHnjc/sU83kaaj1en959NxvybJhDp7aRY/+xlVi2wa X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2814; 5:/zOqEL3CUMd3Dc1r3+e1dStjKziqm04RawG1OJzrsnnTSLWpz6IhRrggqpS8ntNLMiq46IoxkTNwSrkjkiGHBRg7ZvJlJTrTSlrqr4J8VxJRdEdKNI4oA358PrHdy14WjWusGZP0d3yJbzxf+PW/BOvdiwcxEI63Thtm5u1RLKfodq7sLYp0myqSgKHZsBAAAm65ylv7CZSOKcihxS6rn2Il2AwY0q04bVfD8dS5fTdCQIHuh6KmkXxTJDofAs1q0gSw3tAwfWXRQaOtUCrqOg8VNmJRXFJvTD6mopeZKfDSeacOnULrVBeFCvM6wj/YNJe9kEMlNrDjvhQ3gmT5slVU4Y0vvzul7bnSRKOMZucpPsEtHBFcxMYxVEP+Z4hrnJ1Wa30i+V3CQPVOU3mSIX/qP8IhGCKViK0pdTvkZ6i7Uiwvzm8AcxwNSek4w/blK7hZIikkLccK/NW0sgpntwdBZ7Kf2rSteVWHrBx9/iBvFfIh4+r4auN9xtI3ZFG+jOAFw0PATex/lpfV6TgGow==; 24:WZJ6jsWkxiQFXdjFwfV491CC4uWPMLtsOQ1BjskumVS7dhFDIG4pfG8pcZxv4b8/DJWnukpuaesDMKeV4IY9MS/nr9CRWocnoOSyPdhi+xg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2814; 7:5jXG5pGLUPezjoOU/dvmhmoNqy3z9xC3+auyXgt5c+KcqyXeBnjIUoHxkwnVo9mRQkq4duoYRKyOXVU1FBlUCMncmPCRrkVpVhG7GoUFe6VUyQ2Y4AWO62XQKAZAnlWbAUNLgmNQZhxhka5VlGllkqAThtnUaNmzWWyqCgAoAoiJ/UEpPM0AoHMWtJqMek6ZRfNlvvk6MK55xDAF5gow7uAf7RdxwNUiX0GJw/ajcEPbXXxTTyL0c/1/XiSIHD8zbV3NRN53rmC7YTV6zKq2h+jhSwE/MUoLI/CwrLx5KhxX60K0ogHU37BoyHhibiUdjiZfnqToeGAj0jeS4IvZKQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2017 06:54:42.8575 (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: MWHPR03MB2814 Cc: ruchika.gupta@nxp.com, mingkai.hu@nxp.com Subject: [U-Boot] [PATCH] arm64: ls1043ardb: 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 nor/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 --- board/freescale/common/fsl_chain_of_trust.c | 6 ++++++ configs/ls1043ardb_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 1 + include/configs/ls1043a_common.h | 23 +++++++++++++++++++++-- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/board/freescale/common/fsl_chain_of_trust.c b/board/freescale/common/fsl_chain_of_trust.c index 438e781..609e2b2 100644 --- a/board/freescale/common/fsl_chain_of_trust.c +++ b/board/freescale/common/fsl_chain_of_trust.c @@ -80,7 +80,13 @@ int fsl_setenv_chain_of_trust(void) * bootcmd = CONFIG_CHAIN_BOOT_CMD (Validate and execute Boot script) */ setenv("bootdelay", "0"); + +#ifdef CONFIG_ARM + setenv("secureboot", "y"); +#else setenv("bootcmd", CONFIG_CHAIN_BOOT_CMD); +#endif + return 0; } #endif diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig b/configs/ls1043ardb_SECURE_BOOT_defconfig index 861d49b..3f535cc 100644 --- a/configs/ls1043ardb_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_SECURE_BOOT_defconfig @@ -40,3 +40,4 @@ CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_RSA_SOFTWARE_EXP=y +CONFIG_DISTRO_DEFAULTS=y diff --git a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig index 5f9b21d..2d57e79 100644 --- a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig @@ -56,3 +56,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/ls1043a_common.h b/include/configs/ls1043a_common.h index e8a756f..6e30427 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -282,6 +282,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" \ @@ -292,6 +293,7 @@ "mtdparts=" MTDPARTS_DEFAULT "\0" \ BOOTENV \ "boot_scripts=ls1043ardb_boot.scr\0" \ + "boot_script_hdr=hdr_ls1043ardb_bs.out\0" \ "scan_dev_for_boot_part=" \ "part list ${devtype} ${devnum} devplist; " \ "env exists devplist || setenv devplist 1; " \ @@ -302,6 +304,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#ls1043ardb\0" \ @@ -315,9 +332,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 " \