From patchwork Tue Apr 4 22:41:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 746897 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 3vyGNf6PK8z9sD9 for ; Wed, 5 Apr 2017 03:36:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 8EAF2C21C6E; Tue, 4 Apr 2017 17:36:14 +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=2.4 required=5.0 tests=BAD_ENC_HEADER, DATE_IN_FUTURE_03_06,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B57BDC21C39; Tue, 4 Apr 2017 17:36:10 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 2D9CBC21C39; Tue, 4 Apr 2017 17:36:09 +0000 (UTC) Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0085.outbound.protection.outlook.com [104.47.37.85]) by lists.denx.de (Postfix) with ESMTPS id 868AEC21C2E for ; Tue, 4 Apr 2017 17:36:04 +0000 (UTC) Received: from BN6PR03CA0076.namprd03.prod.outlook.com (10.164.122.142) by BLUPR03MB280.namprd03.prod.outlook.com (10.255.213.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Tue, 4 Apr 2017 17:36:01 +0000 Received: from BL2FFO11FD022.protection.gbl (2a01:111:f400:7c09::191) by BN6PR03CA0076.outlook.office365.com (2603:10b6:405:6f::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10 via Frontend Transport; Tue, 4 Apr 2017 17:36:01 +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 BL2FFO11FD022.mail.protection.outlook.com (10.173.161.101) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1005.5 via Frontend Transport; Tue, 4 Apr 2017 17:36:01 +0000 Received: from perf-idc04.ap.freescale.net (perf-idc04.ap.freescale.net [10.232.14.49]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v34HZvNV026346; Tue, 4 Apr 2017 10:35:59 -0700 From: Ruchika Gupta To: , Date: Wed, 5 Apr 2017 04:11:06 +0530 Message-ID: <1491345668-6770-1-git-send-email-ruchika.gupta@nxp.com> X-Mailer: git-send-email 1.8.1.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131358009613194350; (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)(39410400002)(39450400003)(39400400002)(39850400002)(39860400002)(39840400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(9170700003)(356003)(305945005)(6636002)(50986999)(6666003)(2906002)(5003940100001)(85426001)(8656002)(86362001)(33646002)(4720700003)(4326008)(50466002)(48376002)(36756003)(189998001)(5660300001)(6306002)(54906002)(50226002)(8676002)(81166006)(77096006)(38730400002)(106466001)(104016004)(105606002)(8936002)(53936002)(47776003); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR03MB280; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD022; 1:64SkLKUVNcjLx0PsXPmi0ohMR8o5LcQeKLBFy3BjJnKoI0BzA/scgKqcGIT4G498JsZfBP1S1hqxemXGvrTnHLPLy1UpE0orZsmo+8TKb6jb6S0VmzHOu9Dw3DrEHm7mDHVhc6Suss0uHiWJ/XF3qrnXS4fdcd1g6T6RD33EWl+oT15fkZUuxdacAv28PoadPEB2lSLVNlL+csR4L3h8wCfWRb51vgfvh2wG+Jy7ktpY6WFoALUGGq5Em6kGT44yXwnD76I7upfxvc45pkguAKRULvToYk+opyL9igMUkrhhdk8tsUbSsC1FwHAaMM5R/qQpodZclJbXgPEGlMQiyOV3ByhtDemRy2VckZfx1rgcGDPD7/DJAwu+xE93bmb2H0/E+eUZqulXscL0X4gckIh43Xlm1cjpNUkzHlLUKppIkOccDcLML3pI8JxKi0TLimvmyAypn1koK5OzcLiqn+FktqR52DBOnOcssO9mo4/uzGteCA5rT+pPTSnNhrZk9Prxag1d6kkq7StUaP251MnaUmVxHE9AksxJ1xmEGI/AOLvGxeKSkrfR/Boz9GtSy1MvnRpZnfBGKMLhIvfDspoaH5R7jSj+tMfXh+bsGRjc4atrobX9PEz/BA6H9+YymG/UiK4bHZIq/FubPpAHV8rlTgvrHcvcPLaRc9TieH5YQm69DE/XVSa8JgkyAdFqGppQgpW6doRm6JXBxFYQrKWXGpnpYl2n1cFBevJ5eQg= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 2d92f638-80be-4cd2-330e-08d47b810fda X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BLUPR03MB280; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB280; 3:L4Tu8zyJC1gXsgtPbaBOPk1BTsuOoLrMjYc7Q7fzQ5fcAGJcL5WHYXooxdUEoOnBM2FAY6TbbJe0uCOFYR5lKnlSm/01emgXHctN9lvYwMeb60awgd4RwZzlW+FxgS0bEss48IEBPjofmewfpW5QoZCnild8owlgVatk8Ne0biZZulblTa2TI1M5U8AS3CTTIZvc95+ky4aVmgqPWQPrmt6ldjAJMOF2n1Hvnd01iJiEJGuCT93d+DkjOd6/XAabMLJuKfND/ieYW9mZ66pQZETZgsHnXEwnsBVoaTKewRsfmZ1h0mZ94+x+cChhx0keIvDrVD7aZ56LtQwvkLCO442Okz0lDvCawii+e7ZN+lHOw+IqV6JA5eN8wwcMthVqSOkjiohTABcgcyGRxz6B7HNdw0SoRfWpoEUpH1o7p+WKYKtKxHPtZgRaTuRxHQBL; 25:xYRj/hZQUhVhYaehRaDD8xmHOAyHFeMmA47+WEJ2TSLwDTBrzNhniHheWQSAxBqvapTxfe+6cVg/ScqLbtGzrkB7Cg8y6djg9E/8K4796dV5ZURUb/4qwX6VzqdMPF7xP5v/gEJQ+4OUc3B4EeKw93Q6/Rc1ivzlUEJV75U+LfuzJmTmRYM23MfBe1DHAN1yItKQtu2lqI5yhRRqyNyrqAFeC8f92Yh7wpFSJ+R4lTb3TZRYWxbIOBhofT00/gHSlNmLY7iOVjK2YLmv25ga6pxj2wZdixklmfwnuHr7lFGBlUU3Uu+0roUKy+4/2/damLA3jpHmlNJy/LcirAFt6vNKAasd6FzdZyE2vbF4HrrsQRBAm1HLk3kLKZHDsYJirqX3yi1qtID36pN500G91T5K97dcEGTxuclreDiwXzkroFnQ2uh3zbOq7WD0edLcmLfVdXAk5Xyn1D2kHiq+ZQ== X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB280; 31:ejAcaL2yYbp8EAu9gCGxO32Kly0cQiG/BNBRjzKsAryQ1N/Cdt1M2JP7HFeLepxHIC6HMP5zefhv19zT6gTa4FBZE8+3EZ+5BXDtcu4f+O31v13LC1ab0W2TJLq7t9K1uXQuAT47Poc1lO1RNpUkHitC+EJaXUdIE9K58oWPKfcy/ZwEdoy7GnG/51VMUUyfvIb7F8374dgToK6g97ASaPxG+K1ETG2F8oo6rEHaBUtOpXwdeaUhu6zP9fxGA/U4BeGud4x+GHrn/sljbPrAow== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(8121501046)(13015025)(13017025)(5005006)(13024025)(13018025)(13023025)(10201501046)(93006095)(93001095)(3002001)(6055026)(6096035)(20161123561025)(20161123563025)(20161123565025)(20161123556025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259075); SRVR:BLUPR03MB280; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR03MB280; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB280; 4:NKjX2YUnIrjxPRYB+DiUH7LZXKYaNsIvEeXMeDMTpoSqVXuGzsEUCHNjua9JRe1rKdnn68u5Ggo7ZEgJrPqhwAWuQEvMnLNtAPndsyinjShB3Sh2cpJtlnRyhWcTKxfV6vvLY6gHEWXaKgN2162FPMd4F79Rk82kXaHnjv10/bzTXGtXY26jMFkkcHK5gXYSDlWFNI+wOnZfn9meWUrwxOdlObI9WXsGbI2X+ZCbt7vRp5hQOv83J0+TlrV5GvDrsXnXO1yhwQ7LmQNmrZfd4SDbs9fMfd4mQ2mD8Ft4qXaekUzVZMD8UD2+MJU4dDPmcZCN8xem182KxkF4MrWZpACubuRpqhxlMVZO4u9ND2otTW7Zt4jA2AzInWwTnbCC3h+1xCjBRD6GtpNInxv0JoMUh7SnDpmPUweOTM1OIUWECzCnoOfFWcKGVbPSvD6mRQTd4CU3NPYJRiupyEbfNAblrro4mrR9w/bemZwKvmuPIg1pLFlPTm5FFTTb4x0xd4kNbU1VsdAen1n9RHduw9dODtPowRRUUCUTKl1Y0t2nGdmZeT+hT9FdEV4tiUbAes2NKCwOSalkjl53ipxx1e6ho05ej2B+DelGOVApTv14Q8VTQcQrE2FBHatxCiB0ouJLkSWG/whHRfb7hTjpx4RBarhm6K+Px7+Xt9Uzd6oOmQErh5CFQtLAY0FtucrbBnHSOU0+PB9oxuCFuKBRwGWAETTnWAuhiMjFQTvipuzvFERDz4d9fwsTJbongGf+moBhqqHX3dRtSpSNQ2QXkoIo5646iBJ3QarSqo/yduaLGCf171C/yj0NMUdkjKQ/k3yMlJYqguWnaou/X3wOE+uaDJ1+1CL7snQjBjWYCM4rsewCXtoZjOOnGCstMGG45Eltc2IvXin1MRLKKOX4zQ4YRsibObkhC3JmFKXRDNc= X-Forefront-PRVS: 0267E514F9 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB280; 23:kEtGaofe9c8AY0jfo4ubxeYcD+Gn0Ge/fQmM59H97P?= =?us-ascii?Q?HQTqefGfoqey2qUlefmK7TFcVDeFsB+sVwn6p56p4E6enQikq9n1l5DobwfZ?= =?us-ascii?Q?4m/qFqKvXZNAJJmc/Jkz8n8F8/StxkoUEG1jXJP67FFxjMGlSvUF4jtcd9Zt?= =?us-ascii?Q?VCSCYvUfN9hUMgNjdOOpGCteKBo5ZPhchdAxj/6MB3Rx86mVw4g5fy8q2CjM?= =?us-ascii?Q?UgNxlepgL+8adwFhlG7IoD75KaaoYhYK+8Gho4UvgSKIorSa9sGpQpXSuRSq?= =?us-ascii?Q?aSdWqgRnYdvy58j08OrSpJW5YjDlxX+SB7cops+uxnPNCuYmEPEvy8joH32M?= =?us-ascii?Q?HSH7wWA4Dmg7afEFdQMCqGVDKrD5nJC7fN0SvhGj3GZN5dc9Sp7qfv2miOLc?= =?us-ascii?Q?5pG0OmVdHH8P38qDqGd2FA1xZSAwxlqcENymCPBGTGaxwTYaPNFzYmsdzYWM?= =?us-ascii?Q?eFQPicgxC21lNsSfW1I9LQP/Lo9Oiql/5MzYcBIcLszSuqIPHMO+7BcgB4hL?= =?us-ascii?Q?gil/Mg6Zbqj7iCa/wRrO6htsE+tBVWcXqXAU+n0vbGcAtGi5Rn383bFlHiMg?= =?us-ascii?Q?+rWYwFn0jsI4ssXg+dsApOaDEn131vg4FGqpxmF4E2yVDZMclENcal35D94/?= =?us-ascii?Q?ABznwgRLSRHAXicY/wXsVjiH7AORgpP3HWS+6W6B6tslyonThyvWf3/soe4j?= =?us-ascii?Q?csQeFU5Qoboz7Vi+sAazds9HnbWxRA2iXpQTFknVfx4ExzvZ9GQgD8bUEa2g?= =?us-ascii?Q?IKqMdZe2fOBOSyTQKAbcFgfvqDjXbTnT5d/jfnex4kAYb/Ajp/GMlatA7H1V?= =?us-ascii?Q?I0p/SXLJMDQAjtgAEizkjpfRPsS5wnONmkZ1UzTkiZcA1EwHyMaYVKKE8Bec?= =?us-ascii?Q?A1XThR+FBUMwcyoR/tEW72J0dp0Vi6BRFZcQ2JDzcSzLItbB3pjuy9f/FBkd?= =?us-ascii?Q?EoXS3KTPabn2EQ9ZFabK98Xidc10e8G+77bA+n6jDalgu0Rtyk2bMAtNU3pD?= =?us-ascii?Q?COCj1g7xsfwN/TwX7X5Gf/tkM8WsTwJH1uBE4qp/fJ9+6eguT1FrBEzIQslq?= =?us-ascii?Q?Dj1n1lNLh2A+8pXqARS4rEcVgcVe7P2gknm4LHqg/AdQ+/rAbkhGoI9lUt5f?= =?us-ascii?Q?Hyr8LMZZtTBv0Mf/6fYBX7TNsgVHz+LD4kCy/2AfmI1muYFiZoLcaQ8c3Uvl?= =?us-ascii?Q?rcvfIUrEJA4dY=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB280; 6:pWWgcPCIQ41Bc98o6nMaXMYWaTi82okfb4S6bZLH9juvnnzFZu68FMTfkxQL9IggTWXXPwdOA8CsrIAY9VFC+hFg507gXdwov15AmcCvLhGy7FEBbqX4JdvLOFmxpnv+F02OEUu9tr6Fmdn5NPZ0uDgrpdKWA2Dun81N8oIGeug6GY3R4DMiYcNWroXKsrJHc6I4+N4X8T8pb4RV7Fh68o/Eyh0W8WfmjLY0PfSxosWQj0fZro5UDNcQw7IWuou/OzN52E8pPbGbp17Z3e1e7C8JG+r2pWGv2sFsjv7hL2wZoiuGpDsAJ+wIkazMChSzbAzgUKyMyGrKX9voZzL6mb+k6T4oiwIq0NRh8WCiaZcoBg6IUNYyd1khoZ6JjRxYKZZchfrUTyUzAnhdx9jH7w==; 5:sxC9EBK5KEPLKoL2T1TxuwInH0akTNq6XIliX+ZsEk+3yI7eilxoaD6QkmI3CwGwEEXBXOrOCwY8nBUMIT7aneyAUwgFF6xBP5UfhonhJr7bQt34LaJAsCln2r295WR3uAvssUF+k6By+BZ49KoV5HCJAojYA7sEa/zhMEcReujZfxJfeJjWcc2pW4CtlAgv; 24:h04ZTyqx3QZSoN/Pmza/tnuWGJGE5jGf6m+k4B+5qv2GwNVb4ffyH61b8JjNW1KvLglYABzEBdsqWGTzC9VN+pa2teo8XOheL5MdlZ1kR/4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB280; 7:OHfcF1nEHODOh1ozLjFsnLwgmDsDBczRDq9xm3LoACFv6J738PuQ1O4mxnQGNlzVh7GziaZEJ88A0dNdWp8Pi7wq5nQ7+AE2tihtZWQP8uO01fuqIqXY+VyarVJJD7YpXzKs7A8D33LxpgmaWM+hSwC7xqCVQs+O1gXCfft+wewpIUc37DlEgejtZpD7d6Sf93wAhAaCMBnlGoh65M4g4hnupLKoVUiNEUN+vi1vRWubvA+ckBqFSow3hczEd78BBhFbxYdAqMjQBXD0y0clRisn0YEj7sJLaOZ1A1FzaViMHxUE9dqmKxybL3NytHyewlgijBjrkTVbV+8cv7RLZg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Apr 2017 17:36:01.1322 (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: BLUPR03MB280 Cc: Ruchika Gupta , Vinitha Pillai-B57223 Subject: [U-Boot] [PATCH 1/3][v3] arm: ls1043ardb: Add SD secure boot target 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" - Add SD secure boot target for ls1043ardb. - Implement FSL_LSCH2 specific spl_board_init() to setup CAAM stream ID and corresponding stream ID in SMMU. - Change the u-boot size defined by a macro for copying the main U-Boot by SPL to also include the u-boot Secure Boot header size as header is appended to u-boot image. So header will also be copied from SD to DDR. - CONFIG_MAX_SPL_SIZE is limited to 90K.SPL is copied to OCRAM (128K) where 32K are reserved for use by boot ROM and 6K for secure boto header - Error messages during SPL boot are limited to error code numbers instead of strings to reduce the size of SPL image Signed-off-by: Vinitha Pillai-B57223 Signed-off-by: Sumit Garg Signed-off-by: Ruchika Gupta --- Changes in v3: Moved spl_board_init function to arch/arm/cpu/armv8/fsl-layerscape/spl.c Changes in v2: Rebased to latest dependent patches: - No change Dependent patch set: SECURE boot target addition for NOR on LS1043, LS1046 https://patchwork.ozlabs.org/patch/742548/ https://patchwork.ozlabs.org/patch/742552/ https://patchwork.ozlabs.org/patch/742549/ https://patchwork.ozlabs.org/patch/742551/ https://patchwork.ozlabs.org/patch/742550/ https://patchwork.ozlabs.org/patch/742553/ https://patchwork.ozlabs.org/patch/742554/ and SPL size reduction patches https://patchwork.ozlabs.org/patch/744755/ https://patchwork.ozlabs.org/patch/744756/ arch/arm/cpu/armv8/fsl-layerscape/spl.c | 18 ++++++++ arch/arm/include/asm/fsl_secure_boot.h | 9 +++- board/freescale/common/fsl_validate.c | 4 ++ configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig | 57 +++++++++++++++++++++++++ include/configs/ls1043a_common.h | 16 ++++++- 5 files changed, 100 insertions(+), 4 deletions(-) create mode 100644 configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig diff --git a/arch/arm/cpu/armv8/fsl-layerscape/spl.c b/arch/arm/cpu/armv8/fsl-layerscape/spl.c index 73a8680..dfacf98 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/spl.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/spl.c @@ -41,6 +41,24 @@ u32 spl_boot_mode(const u32 boot_device) } #ifdef CONFIG_SPL_BUILD + +void spl_board_init(void) +{ +#if defined(CONFIG_SECURE_BOOT) && defined(CONFIG_FSL_LSCH2) + /* + * In case of Secure Boot, the IBR configures the SMMU + * to allow only Secure transactions. + * SMMU must be reset in bypass mode. + * Set the ClientPD bit and Clear the USFCFG Bit + */ + u32 val; + val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); + out_le32(SMMU_SCR0, val); + val = (in_le32(SMMU_NSCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); + out_le32(SMMU_NSCR0, val); +#endif +} + void board_init_f(ulong dummy) { /* Clear global data */ diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 423c2c4..56a6ba0 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -27,10 +27,11 @@ #define CONFIG_SPL_UBOOT_KEY_HASH NULL #endif /* ifdef CONFIG_SPL_BUILD */ +#define CONFIG_KEY_REVOCATION + #ifndef CONFIG_SPL_BUILD #define CONFIG_CMD_BLOB #define CONFIG_CMD_HASH -#define CONFIG_KEY_REVOCATION #ifndef CONFIG_SYS_RAMBOOT /* The key used for verification of next level images * is picked up from an Extension Table which has @@ -87,7 +88,11 @@ /* For SD boot address and size are assigned in terms of sector * offset and no. of sectors respectively. */ -#define CONFIG_BS_HDR_ADDR_DEVICE 0x00000900 +#if defined(CONFIG_LS1043A) +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00000920 +#else +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00000900 +#endif #define CONFIG_BS_ADDR_DEVICE 0x00000940 #define CONFIG_BS_HDR_SIZE 0x00000010 #define CONFIG_BS_SIZE 0x00000008 diff --git a/board/freescale/common/fsl_validate.c b/board/freescale/common/fsl_validate.c index 2b723a4..235c6ab 100644 --- a/board/freescale/common/fsl_validate.c +++ b/board/freescale/common/fsl_validate.c @@ -356,6 +356,7 @@ static void fsl_secboot_bootscript_parse_failure(void) */ void fsl_secboot_handle_error(int error) { +#ifndef CONFIG_SPL_BUILD const struct fsl_secboot_errcode *e; for (e = fsl_secboot_errcodes; e->errcode != ERROR_ESBC_CLIENT_MAX; @@ -363,6 +364,9 @@ void fsl_secboot_handle_error(int error) if (e->errcode == error) printf("ERROR :: %x :: %s\n", error, e->name); } +#else + printf("ERROR :: %x\n", error); +#endif /* If Boot Mode is secure, transition the SNVS state and issue * reset based on type of failure and ITS setting. diff --git a/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig new file mode 100644 index 0000000..3f35d64 --- /dev/null +++ b/configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig @@ -0,0 +1,57 @@ +CONFIG_ARM=y +CONFIG_TARGET_LS1043ARDB=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_DRIVERS_MISC_SUPPORT=y +CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1043a-rdb" +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_SYS_EXTRA_OPTIONS="RAMBOOT_PBL,SPL_FSL_PBL,SD_BOOT" +CONFIG_SECURE_BOOT=y +CONFIG_SD_BOOT=y +CONFIG_BOOTDELAY=10 +CONFIG_SPL=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110 +CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y +CONFIG_HUSH_PARSER=y +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_SF=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_FAT=y +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_OF_CONTROL=y +CONFIG_DM=y +CONFIG_SPL_DM=y +CONFIG_MTD_NOR_FLASH=y +CONFIG_SPI_FLASH=y +CONFIG_NETDEVICES=y +CONFIG_E1000=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y +CONFIG_SYS_NS16550=y +CONFIG_DM_SPI=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_DWC3=y +CONFIG_USB_STORAGE=y +CONFIG_RSA=y +CONFIG_SPL_RSA=y +CONFIG_SPL_CRYPTO_SUPPORT=y +CONFIG_SPL_HASH_SUPPORT=y diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 3fb8740..b71456e 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -66,7 +66,7 @@ #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_TEXT_BASE 0x10000000 -#define CONFIG_SPL_MAX_SIZE 0x1d000 +#define CONFIG_SPL_MAX_SIZE 0x17000 #define CONFIG_SPL_STACK 0x1001e000 #define CONFIG_SPL_PAD_TO 0x1d000 @@ -75,7 +75,19 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x80000 -#define CONFIG_SYS_MONITOR_LEN 0xa0000 + +#ifdef CONFIG_SECURE_BOOT +#define CONFIG_U_BOOT_HDR_SIZE (16 << 10) +/* + * HDR would be appended at end of image and copied to DDR along + * with U-Boot image. Here u-boot max. size is 512K. So if binary + * size increases then increase this size in case of secure boot as + * it uses raw u-boot image instead of fit image. + */ +#define CONFIG_SYS_MONITOR_LEN (0x100000 + CONFIG_U_BOOT_HDR_SIZE) +#else +#define CONFIG_SYS_MONITOR_LEN 0x100000 +#endif /* ifdef CONFIG_SECURE_BOOT */ #endif /* NAND SPL */