From patchwork Mon Feb 20 20:37:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 730080 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3vRpP85hBHz9s9Z for ; Tue, 21 Feb 2017 03:05:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A04F0A7BFB; Mon, 20 Feb 2017 17:04:58 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wSV4tBCjCwt2; Mon, 20 Feb 2017 17:04:58 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id AE402B3885; Mon, 20 Feb 2017 17:04:57 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F0D0AB3885 for ; Mon, 20 Feb 2017 17:04:53 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8_Bf2cfWbxKV for ; Mon, 20 Feb 2017 17:04:53 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0056.outbound.protection.outlook.com [104.47.32.56]) by theia.denx.de (Postfix) with ESMTPS id 25854A7BD0 for ; Mon, 20 Feb 2017 17:04:46 +0100 (CET) Received: from BLUPR0301CA0016.namprd03.prod.outlook.com (10.162.113.154) by MWHPR03MB2958.namprd03.prod.outlook.com (10.175.136.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Mon, 20 Feb 2017 15:31:27 +0000 Received: from BL2FFO11FD015.protection.gbl (2a01:111:f400:7c09::173) by BLUPR0301CA0016.outlook.office365.com (2a01:111:e400:5259::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13 via Frontend Transport; Mon, 20 Feb 2017 15:31:21 +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; nxp.com; dkim=none (message not signed) header.d=none; 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 BL2FFO11FD015.mail.protection.outlook.com (10.173.160.223) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.919.10 via Frontend Transport; Mon, 20 Feb 2017 15:31:21 +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 v1KFVBrk016014; Mon, 20 Feb 2017 08:31:19 -0700 From: Ruchika Gupta To: , , , , Date: Tue, 21 Feb 2017 02:07:40 +0530 Message-ID: <1487623061-28098-3-git-send-email-ruchika.gupta@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1487623061-28098-1-git-send-email-ruchika.gupta@nxp.com> References: <1487623061-28098-1-git-send-email-ruchika.gupta@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131320782817523419; (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)(7916002)(336005)(39410400002)(39850400002)(39400400002)(39380400002)(39860400002)(39450400003)(39840400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(4326007)(86362001)(6306002)(47776003)(2201001)(189998001)(77096006)(81166006)(8936002)(8676002)(81156014)(8656002)(5003940100001)(626004)(54906002)(53936002)(966004)(97736004)(305945005)(6666003)(4720700003)(6636002)(104016004)(85426001)(2950100002)(92566002)(50986999)(68736007)(76176999)(36756003)(38730400002)(356003)(50226002)(33646002)(50466002)(105606002)(48376002)(106466001)(5660300001)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2958; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD015; 1:EFESwRifQgfV7QtVijX3f1v9XqfbdgJnBMXTdWZTXFE0zhnDjQnYgopIHqcpwcE9sMWkxqhIheGzdMfJC5GGh7yO4huU7Dbf/Ubvhk8h8A2ydsRi8St+14oeHY51TOdmg9bFZl9bn4YbHpYfmoosoVoidDB6MgDSgdfT3qExtYoaQedMHWeSrqnpsX6CRVMcf8m+RapTdBiH0oGSXcJ2yrOc2L6KVGqZ928qQWM2Lwcj4go/GPzlUUzFrQU6dtNvyN9FE1yO1EpuZJO/WPEYZPVFj7ALLLHS8tWzNw7+Mfenfx3U/LpjV+1oVEeJlH2I8bsMsfrKUx/NmfTP/HtowDpTwhorw4jgbF7u+CNQPXK9wuzfm1txbuT0eK2d5GTlJxwDOBDt6L8rAb9EpJpbE3pdR4aRWO+APqB1+4903A97CcRF6S4VZaZ9w3hDUkyNvtnj9jN+9g/0wsB87xZBkeZG1VJfvu+gFFMknMJvONsPSE2+x+FsAJH3R+MWHqziNfcMMixi//V/WaaZb9T2zLP6WrTzpo1Wb/IUpp5JCzyN7CorCBp6nP3P1TFv2HSBF6y0Q9TeQkAT8YFADiv1XtYZd6MKlSUs6y/F79ZV+c78XqKOZdPaQ/LPLCsVAYD/LedIlRv4yxc/ft75AGt+ahV4nNMSW6k/yzVaqRZp/+5Z3h2mAuJnCzpPYLyujsG6W8zmJuPYSmFcu0qIgTTLZQ== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 5875e709-0bf0-4736-f6db-08d459a585ed X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:MWHPR03MB2958; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2958; 3:0MrHE9PleTVsbsxHkuA+xDVuO96QXQgvuMQxpS+Un/MTSFDv5PZ8IcBi4vSjroFCV3evTzD0AA/6tVTr90FWPtwTl5gjqhPon7h4/Q3bL29EDQF7gkhb+LHpjEzKoIB2enV2MB1zC1wFcQgp8h/TmGTVqGm2P5TqQyQkLb9BAI+XvQN/VGMl8a61YVBaS+BSYRVbyYionNJA8/yTJaaizR7764OBfVBXLrX79bfJ9KhacgdAPJ5kPqQokHEMkzCSx8sIyXP3NvWZe5E8i5pgILldYQnc7mMVFm5eNWOrrf0r93WmBXJ9cK2fjg8uzasC/8RlaxHTS20vPxzN2qLFKkzoUKWcY/H9HoFeRraBCWHOzNAXDGXRO8SfHSEucyEY; 25:d35hiUNzYD8GhLgc5lClZhL/KhEhly0+4MzRiaE4tVXimaaE4TJE/1YGXOgPcoPl9dACstfOPOS+rKLW/KauaMMS8t4zl8yLE4m765QQ5k6Y1kNNktjtBeVg8jx24c2/zgIpSCr3yNqkkvu3YcHa93PnIp/wXWVQMA4otbI0FJwxjTirU/Zu+/kbsSwlIRnfiYeJ5ZDl1/Ffnvhr25l/PonP13Ob7EEZaG140q7/oi8a+4baZ9/ApXnLeXm3d+/RoXIUV1uWPYzjiYD4bSvdJcwhOtDlnNnBPicuAwoYBin0BVuhr0JMjuywpC3zvbc7FZQk2cxZXo2mFMeYNbRhZil1gKuYsY9ke5MTFdelrl8GEpxVzBhds+42uTSsBzKG3Ep5cUPX7fsPEDgXahD2oxdLh3YGW9bYoMhJnygeqTlHQQTy1sELcJzWmtPFuE7ErKTohf7XZs2vt80wogS1Cg== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2958; 31:Eo00BRsftNaCJ4NdapgQrpsc5wHOxEw3BkuMu+WDUKjBVvgEue2pCmT0UCB2DwKnn7SzxA7+v/HZPJpIfJ/6wRVTG3hIdO7DfckBmMN6wCuMfGVijyrpR/UmxyXo3xV38Kqhl015C+ZVlWBIn9fVq1vylqy/xMczRYqBeSgVBW5Ea3h/V48aZlLzFMZ22CSwZ+ruG3Fj2lAMqMJKTAWb18NEDbBLCqacPQBRJnf2KxlWkkU/XWedFaJtyz+Ao088IzwFqDZGQAVaCOUPI7O6w1+5gJM8+WcGDStoS6Sqsrk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13015025)(13017025)(13024025)(13023025)(8121501046)(5005006)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123563025)(20161123559025)(20161123561025)(20161123556025); SRVR:MWHPR03MB2958; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2958; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2958; 4:9lHhjFQTJULna0tcSlOg6pUJy6nst8Eqa9/pN0LVvFpO+wzKHirlBSvwKkGkjk3kk8F9Zyf1ALXUIq2VJHihwPmxASLYdfWRwWB/nkSHNTlvji2+LeM4GRzuj5FFEIBhwIsY6e00CU4Tm6vFKl6zpRNi1EjTzGJthSrhU564O/p3Ao6+DalXsHWYkkPKEGNGh62GqqdCBWYr2D+FrbPDjzrhRpdfyEIJ4YQqMDSs3XIm2mJVe9kHsewJzdhXgUGQtiEtjj2OfV4/uzNAUFs8BETbIDDauaYwS8qX7WshXX+XJ2AHGJTZRRo+VsYm0mqS0Ni2Kp2XVDY8/fZCt2eOP/yDcKMPYcXBl+m7uUrWBleRNdYmmf/M0uPG9pURkoyjwMc3aBN7E/TxTb397kdDFOnB+8h30lhOMKKnraRZgE5VpRkXzMZR33EyI28wZaCwC98tGrVgjzOamGp3Ed2Hs1tqL53LK+YYtn0q/5edAFAN5iY0dwwMCmOXLvoD1hHjmZansrMLHhJu9MdBqQ0ku4hg84VdhYNFrSxVZ+rUCtgeTr7NfU+sdBmVjG/SlVO+tgmouAm7g282yeAkLq/5yvdQ2sLguYD462RPDEh7GgEsxusZjyP5wIictQF1CHzjso9zMUe178Vf/EYQfEJ5pHqPeypuYaBKMGH/NwCZJEfjnaVEEg2qv5ZUm4QC1JJVBfptRRH6iF39z+kt7SCaOUdeCmchuBKOf2BROdVfaV5sq4ufJzrn0TPNQkgNH6Mb X-Forefront-PRVS: 02243C58C6 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2958; 23:AAtAIUXevuM3B5Wvwj0KFcvid8UlHEfx0c8xvZsbY?= =?us-ascii?Q?Brtu7+hvIIfN4tpVZxbZfdvmAYe5U7PeIevAT4AGWFv2Qekvxz8f9susTZOZ?= =?us-ascii?Q?Axdzwzev3hnSCgxlX118YH8XdQlwNATctnHc+VnESAIGAJbR+F+uszGkouOc?= =?us-ascii?Q?HJ7kHsq7ULeKxZBi1ylspWvzP6/OKsWJnq5JJMM+3iUTErkNEB8XYvZTefSB?= =?us-ascii?Q?FrB945CVg4gXHqGkKiRsGeUDuotmPfmYA3ibIyOMeLP5YR8WtEmmK0cJV3Eg?= =?us-ascii?Q?SMgztmWZY2h3+d2NSGyWvegfY9e5VBjux8Yfgs3ns0HO9hkpwEH/ZLVpTJMQ?= =?us-ascii?Q?Jt1zjksUknKzGKY6/4ai83whAnEXBnSywJ+T/CJ3tJpYt59QqjnLpAwHYIkr?= =?us-ascii?Q?uzwtM7nm9vWBMRiL1zGHeW4nDkewaOfJMxZo8JWnEm6BEhvTZ08WkC8AxVHd?= =?us-ascii?Q?bk9I2oixFIMgh+4RJtKZMkB3NK5xHzvI1uqyLnHUCCGG5ket9iZonEZ5eRSQ?= =?us-ascii?Q?soe3FleUyQRcab3Ytfd/DWkhIuIl28kZ/AvIiDl1cB3f1ZblROneap4xEYuE?= =?us-ascii?Q?dCFfl+RsssrbpD8U6FzUFI8FaUMwHSWQk2z65j0UsbAcihI8qru1aSldghmU?= =?us-ascii?Q?2YIZ0WnSL09uOPcELdD9/ixHUZXzfOQXxY9Kvv7s5IasIN5yFAKNG/LNPVhW?= =?us-ascii?Q?HNZ7acSvgoYWZdA5x9LRTVMmXXXcBxPZXsop7FbKnLTwHcHO3T7SfdE0zPzb?= =?us-ascii?Q?PhNJyw7c7JBNBcNWQ0UGI2WFmi39vGE0ws09ypotMcj8uSw9K/cwN2EsvsJF?= =?us-ascii?Q?x0q9+A3VIJqVomXONoWguHGQbXme95WrefffRZs2ee47nCbEvSDPPzg4B105?= =?us-ascii?Q?w5u42uJzjOOSey9HsD5834AIg+IW4//mbJ+0h52coEjb6NrEakUaefX2gRa3?= =?us-ascii?Q?fQbr8PTEusQa/thGSgogT6r/J0n63Gdi+lpdd5PtxQof7F4vfvUx0NIjexKi?= =?us-ascii?Q?gKUJJKJ6VP/1aSRJnRZzsfnXhFCkMCf3dsaYcrUsUQ7Fju+X6cPtouoGWYBy?= =?us-ascii?Q?8pr10SBGuF0JN0lswbouDBL3zttGijwlWORjWIlA9IRmzOixMBjTK4xleeb9?= =?us-ascii?Q?oz5BT0FqIT67s8Kk8qHaf5Jp2Nx4D5D2kohpfQrDSy0FettYmN0YR0ypnqeE?= =?us-ascii?Q?qIW+cCquASXSCyiyEDWxdh5S4y/E5Mfu9SD6oBDhoKuxG9TeQukLW7BYnnxN?= =?us-ascii?Q?hDUFpcZ8m1pbapsb/hhQadouSZQTH7liMzbh6wWfPBo21CCAujGBrT1qS+Ml?= =?us-ascii?Q?wGI8TCRjEkXVHbJebDt06oWEDVRsYPTSKJgVtmdVdeGFaxKX5DRevkvL7DWF?= =?us-ascii?Q?8ciKg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2958; 6:PXvBpHtkvcOwACZ8x/MsvwuUMnW9g5QxwZmDW7/wcC5l6R96tWNkbfyT7sxP2krPbBihOaO0JoLpWor4c2sP6VIBagkFCh+zpaethDzMWX7uuZju/P0kXHU67LbGkyZ2mVjNyTMrXTNx5Y1wr366IqYsKac3dBNKY4W+dY/lfNT2Optb2757XrRR7AuUsfBeKEArk5pg4FFq1S5YBdqVNE2VQpaXPYsVydReZjA70RE0OkyECtg6+KWHM6FudPQcB/sg5Af0Fer1gTxe/AfUKqoRfD4cpWAXnvaDMJuBsKuUBbGmET7H4H1fryeqyzs+Cs3a9Dwl5kCo7bDolVycWTMb3nPuua9xD4we2rI4oU1L9l1vmPFArg7x5++Fup/w54RaCM19g0YDMDLyHT/OLY3GzWpj3Mqsj8JbHQPrmfU=; 5:xDNbzFcAhLUwy1oKZshClL8b7FSIiN6o3YjshHe+5cTbshO9pMuQzOW3LMBMk/4uqZXYl7WEqmFFKCAmB6/m8FMMGCQrKU1JdERbee8vqXyMnVSWCamNOrL6rakBTWwQEgSYunEKeOJLiw4en9vQcVg9WeP8kzYnRvQi0kYtc7M0X2+AXV6ph19Bzx0jhVFi; 24:+CmXJZ2XT4tL+IYQAcQzDjymsnTkDRecm/ndIDmMTSTR9aRXCNQuWcqj+8lL127iDnaIJJUYw+1lyG+/Kk7PdscH5INIBPH7XEyIlFJfDl0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2958; 7:UYbE+EtTw+V/jYVi+oEZ3SsUgyY12jj+0cqHCBghLGZ3ewewPHiqZGPDPrHlFf4KlEY1e0NUBGJLXtDsJyvMwDdyevIOuu7gUI4CB/74tQ3EfyYBckqmXAnybKGKheqacSaPdlBtoCIuSGljy8NR5KpYzKVIBlLO0ydw7rdCjVTA9/2e5z+sLdTmG5V1ev/IG0M30R6OYuocXRNJ9OXSPgq3KFTByHrCbSA4eBRQ64LN6cuKlV8QrCj5HjiCEFtsKXGv0dQD7dYi9HoyzdySuLZrrN7jib+XXxE3cWACl+CZYTzy4GeOKZo50dU5TWFXWFWwXQ4UtmQWu13byEVRrg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Feb 2017 15:31:21.5807 (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: MWHPR03MB2958 Cc: Ruchika Gupta , Vinitha Pillai-B57223 Subject: [U-Boot] [PATCH 2/3] arm: ls1043ardb: Add NAND secure boot target X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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 NAND secure boot target for ls1043ardb. - 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. - MACRO for CONFIG_BOOTSCRIPT_COPY_RAM is enabled to copy Bootscript from NAND to DDR. Offsets for Bootscript on NAND and DDR have been also defined. Signed-off-by: Vinitha Pillai-B57223 Signed-off-by: Sumit Garg Signed-off-by: Ruchika Gupta --- The patchset is dependent on the following patches: https://patchwork.ozlabs.org/patch/717614/ http://patchwork.ozlabs.org/patch/724332/ http://patchwork.ozlabs.org/patch/729932/ http://patchwork.ozlabs.org/patch/729980/ arch/arm/include/asm/fsl_secure_boot.h | 7 +++- board/freescale/ls1043ardb/ls1043ardb.c | 1 + configs/ls1043ardb_nand_SECURE_BOOT_defconfig | 57 +++++++++++++++++++++++++++ include/config_fsl_chain_trust.h | 9 +++-- include/configs/ls1043a_common.h | 18 ++++++++- include/configs/ls1043ardb.h | 2 +- 6 files changed, 87 insertions(+), 7 deletions(-) create mode 100644 configs/ls1043ardb_nand_SECURE_BOOT_defconfig diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index a1474eb..2f719c0 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -74,7 +74,7 @@ /* Copying Bootscript and Header to DDR from NOR for LS2 and for rest, from * Non-XIP Memory (Nand/SD)*/ #if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_FSL_LSCH3) || \ - defined(CONFIG_SD_BOOT) + defined(CONFIG_SD_BOOT) || defined(CONFIG_NAND_BOOT) #define CONFIG_BOOTSCRIPT_COPY_RAM #endif /* The address needs to be modified according to NOR, NAND, SD and @@ -100,6 +100,11 @@ #define CONFIG_BS_ADDR_DEVICE 0x00000940 #define CONFIG_BS_HDR_SIZE 0x00000010 #define CONFIG_BS_SIZE 0x00000008 +#elif defined(CONFIG_NAND_BOOT) +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00800000 +#define CONFIG_BS_ADDR_DEVICE 0x00802000 +#define CONFIG_BS_HDR_SIZE 0x00002000 +#define CONFIG_BS_SIZE 0x00001000 #else #define CONFIG_BS_HDR_ADDR_DEVICE 0x600a0000 #define CONFIG_BS_ADDR_DEVICE 0x60060000 diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index 0b3840d..62ab749 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -58,6 +58,7 @@ void spl_board_init(void) out_le32(SMMU_SCR0, val); val = (in_le32(SMMU_NSCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); out_le32(SMMU_NSCR0, val); + printf("Completed spl_board_init\n"); #endif } #endif diff --git a/configs/ls1043ardb_nand_SECURE_BOOT_defconfig b/configs/ls1043ardb_nand_SECURE_BOOT_defconfig new file mode 100644 index 0000000..66c89fa --- /dev/null +++ b/configs/ls1043ardb_nand_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_NAND_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,NAND_BOOT" +CONFIG_NAND_BOOT=y +CONFIG_SECURE_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=0xf0 +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/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index eb45e98..40d323e 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -81,17 +81,18 @@ "setenv bs_size " __stringify(CONFIG_BS_SIZE)";" /* For secure boot flow, default environment used will be used */ -#if defined(CONFIG_SYS_RAMBOOT) -#if defined(CONFIG_RAMBOOT_NAND) +#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_NAND_BOOT) || \ + defined(CONFIG_SD_BOOT) +#if defined(CONFIG_RAMBOOT_NAND) || defined(CONFIG_NAND_BOOT) #define CONFIG_BS_COPY_CMD \ "nand read $bs_hdr_ram $bs_hdr_device $bs_hdr_size ;" \ "nand read $bs_ram $bs_device $bs_size ;" -#endif /* CONFIG_RAMBOOT_NAND */ #elif defined(CONFIG_SD_BOOT) #define CONFIG_BS_COPY_CMD \ "mmc read $bs_hdr_ram $bs_hdr_device $bs_hdr_size ;" \ "mmc read $bs_ram $bs_device $bs_size ;" -#else /* CONFIG_SD_BOOT */ +#endif +#else #define CONFIG_BS_COPY_CMD \ "cp.b $bs_hdr_device $bs_hdr_ram $bs_hdr_size ;" \ "cp.b $bs_device $bs_ram $bs_size ;" diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 70099f6..97282b2 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -91,7 +91,23 @@ #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 #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) +#endif /* ifdef CONFIG_SECURE_BOOT */ + +#ifdef CONFIG_U_BOOT_HDR_SIZE +/* + * 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_U_BOOT_HDR_SIZE */ + #endif #if !(defined(CONFIG_SPL_BUILD) && defined(CONFIG_SD_BOOT)) diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 972ccb1..db782fe 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -136,7 +136,7 @@ #ifdef CONFIG_NAND_BOOT #define CONFIG_SPL_PAD_TO 0x20000 /* block aligned */ #define CONFIG_SYS_NAND_U_BOOT_OFFS CONFIG_SPL_PAD_TO -#define CONFIG_SYS_NAND_U_BOOT_SIZE (640 << 10) +#define CONFIG_SYS_NAND_U_BOOT_SIZE (1024 << 10) #endif /*