From patchwork Tue Jun 14 17:52:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 635196 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 3rTSZS4Pbtz9t0S for ; Tue, 14 Jun 2016 21:48:00 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 68F30A7552; Tue, 14 Jun 2016 13:47:54 +0200 (CEST) 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 bnfzwRi5UpS3; Tue, 14 Jun 2016 13:47:41 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E373EA775C; Tue, 14 Jun 2016 13:43:36 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B1245A751C for ; Tue, 14 Jun 2016 13:37:33 +0200 (CEST) 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 a5NV8LLHDRkH for ; Tue, 14 Jun 2016 13:37:32 +0200 (CEST) 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 na01-by2-obe.outbound.protection.outlook.com (mail-by2on0062.outbound.protection.outlook.com [207.46.100.62]) by theia.denx.de (Postfix) with ESMTPS id B2FCC4B660 for ; Tue, 14 Jun 2016 13:36:49 +0200 (CEST) Received: from DM2PR03CA0031.namprd03.prod.outlook.com (10.141.96.30) by CY1PR03MB2379.namprd03.prod.outlook.com (10.166.207.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.517.8; Tue, 14 Jun 2016 11:36:39 +0000 Received: from BL2FFO11OLC002.protection.gbl (2a01:111:f400:7c09::165) by DM2PR03CA0031.outlook.office365.com (2a01:111:e400:2428::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.517.8 via Frontend Transport; Tue, 14 Jun 2016 11:36:39 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=none 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.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11OLC002.mail.protection.outlook.com (10.173.161.186) with Microsoft SMTP Server (TLS) id 15.1.511.7 via Frontend Transport; Tue, 14 Jun 2016 11:36:38 +0000 Received: from localhost.localdomain.ap.freescale.net ([10.232.14.164]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u5EBZnIW004141; Tue, 14 Jun 2016 04:36:34 -0700 From: Sumit Garg To: Date: Tue, 14 Jun 2016 13:52:39 -0400 Message-ID: <1465926760-8730-4-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1465926760-8730-1-git-send-email-sumit.garg@nxp.com> References: <1465926760-8730-1-git-send-email-sumit.garg@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131103777984757994; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(47776003)(33646002)(86362001)(4326007)(50466002)(8666004)(2351001)(106466001)(2906002)(105606002)(356003)(586003)(50226002)(11100500001)(85426001)(8936002)(19580405001)(77096005)(36756003)(6806005)(19580395003)(76176999)(104016004)(69596002)(48376002)(2950100001)(189998001)(87936001)(5008740100001)(92566002)(81166006)(229853001)(81156014)(8676002)(50986999)(97736004)(110136002)(68736007)(5003940100001)(7059030)(4720700001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2379; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; CAT:NONE; LANG:en; CAT:NONE; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC002; 1:o1r25MZrMXEq7nEk6Jum46jk1qlZ4M1X4clgmL5KNpqrJ514Fn2DfbNVEfZl5LfFZq9sMviwlGjRSxL9ZXWj+Y6p+gb8nwDdZ3oSX7wXGwnoUQRN/hg5BhOk/hQvCbwTKWMRvurdNZAo6iVJ2vJ3J293sNVW3DW2yWIoO0jRgIVbs6S9dMIPzJJOKieM/mTSOg4J6scSBCBezhfgj2guN0FidmwA+Yc4Ab2otpbaAw7Ybbvp5iMFiDX1RorZnSlIaIAScVQ0hC+yURNL5skMSWAtA13kMeEbc7R8llxXlKDYgMwUO9hU8EPSQgTyLscIpyo6gFnXGMBk4RMhZdqf9VMbuNQHaCwmVENGD2ljpbGi3fZ1x+aNvQZ4eR1HsQwztakChFCWm7QGs4FHHprhKhRDqoAM3sEVWKg68lxHbH1lsTDVPimFd2y4WK66fvfXvRjhECB/rYzvGNGHjWvQhTXxCDQ9qxg6Ys1nOaLteLtaSp2vyKfA2kAjIwAxQajjWsOIc3HB/815Y1K4iEqtPkmWjEdwlwQwFUMTzx80CDyQxfZ1s1XZ17gM8GMd/R/9BIjwSVWfiutygE4AR1rUP6X1g879SgR99IzhvFzt+4OJZ3qyeNMAeGz1qhYw7ZhSXLF9XFPi+vCAIeCtbLntz8poVlTJnM/BdoHl3feMNjOU1u6FkmJcgTXafmQqsiHe MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: cc83c995-7f7b-4dbe-40ea-08d3944825f5 X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2379; 2:UsjWZZHZhD81g7AgdXlvEnQ/yNoROP/XtjFqHmTHwqg7BfzlczwTaBIqQZi3GIpELKuUY9p0fFR6BEkkB37YNnGekcMlWC1/KduchMYTxXVRteZZm6bOqGXf5fo8P3WRImJvCviShNq0nQtcIO3xr154Wshr1dRo2eX9wooxII7shuUjHbApklDV+2IiDzSg; 3:WwCISry1qRuxSDbSHfooQ72i8WcEqUPfRq9I08DuvmvnFGS/hk4PZ7lXtxRY0Km4hRpyMwdNYd4YWVZYRvnn1XxF4VdKpJv3UyaoJ5PA+GE0IDiL4H5LyRJ/549MM/HVLodq2vRkRzgfX/PrOho5q7454tWmBbSjcbQiAIs8is9eWloKl3ckwy7W3vUv1SmBRWG451koZdI3i0Ob/qAvDXuO2yPVqMfIkYtFZ+v50Qk= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB2379; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2379; 25:dgB2SAtPO5zh7/U+wzntXE/DpXuzBDrna3RP240aYSOwofeumOZKKanMZtwD3UFnjsaRG791dExo8NyxxYoutDSh9v31Sx3W9LhbX1BK+eQ0BY2Qju+0I4k0bMD2y06EDtf7OdD/kmFffKpTK+bSCccpAy6kNJpwDGjKhZBjQ624+gVxPURgtBHlFiqCLA/4Fqml9KDMSkVrmc+DzZxcZ6t7GStXY+TLqoBrU1M+r17+82eLWyXXNrrfiOZFrRcHXdXacIBq1XU7b2mpdz3Qi3I2yInn4G+MZSGC5UdfdJmtPoVHF5d//aeh9XCp0cgO1L0AlPMZ6pXLsMg3P6GvUFRVyFFfH4xUGJdR8w427PYtZ4mlWvJzXK1As+QQPONSIss8rafRTxXAGCsJLiMVGy/0T3qiSwwKA6XN6XO48mC6bzhHPIyCuQSeGYDyfSa1cLY/sE7tvQSSIWdvUZP9VME9jMJpzqs9slb6Iyeg8F8/S+lKnZxP0N8xbvTK9RJQ431YLMwXekRMyNk47et4fPZ7stYVYM0ycrP10DkM7tKSEJnbyv65ZnfnYND8pI4CAQcihPxO7i08SGx9ulVXFMNItdaex0uBRJLIoBO1Cdwha88docQXEqiaNqbN/PkNG3Dp13Z+/7LpvUzRW2sjSSXzcND9QIOkVx4VTg8EHzcNOr2kE2YrjoHNovTWx6s/6E0lZtvKPVTRC4Xq6yGpnzUtQEEGGoMMvFgydY0C7+7iCLy/Dxt3sePMult10ojuAN58ubLQwXX8adbFIR7zOA9N0cdQ6OASWYL9J/9lKOw= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13018025)(13023025)(13017025)(13015025)(13024025)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:CY1PR03MB2379; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR03MB2379; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2379; 4:JtvFp33zETQCGRJKcywmQaXGW7hqYkrv5eiWt5upBQZwj5s7HCBr3lErP6noMyqYFAO603/RuaWVeXh9nLiatJ1mAmHFmAlxiEGXktCN5Bje6cwUS44aZuKyU/BSRR7Ca4DuglTAEyUdEGuoXRlCZv53QN7gXkBUKY3Zu4UxnJuZxYawmmsF94UT9HMtcSkFJ4c0nyXNYf5Zhw4FgxahP5dMC3HQGrqj+Cx3UMoAHOO65i0IFmFRwkeVKCnWxF5QAIuCaaWEQECTee8WSLSliKSkYuJE8CEcN+sqd1cNXhrpR11jS6Q5nLBhvFfPjB/4J6n3h+rZNFxrAcJSLxOem9WM+eX327MjkRYA7Ia7XNNJAeFww8F6oopJqRVGzM9ai1ory9WscNy3kRfYm7Ztl45nqI22anGkl0gUAjrgtGVfZVVEz/uNhduyqiw97a525zqekSMlugU0KXU+CnyzZJ/fCXqMM8wljAz1BQot4mOOYFw0Tm/dLvYVp4SOcRZi7/HMqm5OkqIju7p30bQ/zg== X-Forefront-PRVS: 09730BD177 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2379; 23:JWUiGm05st5rrIWWMZKrSLT81PDfsbC34M3s9VeCk?= =?us-ascii?Q?1Sb5vacRwU+jDTmJPIvrt1JmddYEeQqIkifWsV3TdMJWUdAXthv9jppFxsEt?= =?us-ascii?Q?hFl9DQq4unZ9Ro36oEtpIU+7fwwClV+CHnrnZJijrqsAhmZCwxgcqzA01N4K?= =?us-ascii?Q?/ipoOlxm2YhSsWzTlS7kXVpla5GV4dVma04U1lKhJVSmvSgt531kGAleATFK?= =?us-ascii?Q?/tNCN68v8sqo2/rYN609gocJl+7rMHRtwt4oqH1PgvI0fAQTdkWqTTs0upsK?= =?us-ascii?Q?dKq8kfkDLodZy2uIaHwd/t/64hjr+fi6zuLf1lhDpuyeq13o1K48PM5y2XZE?= =?us-ascii?Q?o8cnViwvu6AMKbPm/VMnrPiGxu0JqymKTBRM17olHI36k/nYQVJ9DBftkoBc?= =?us-ascii?Q?wZb0kdzZivXYJlLHDKfQnfzLjfp5Ty6cFP5aQSGrXFEFrJgAZbeDVdNKwkoN?= =?us-ascii?Q?T56lb1RlWTY8ZuTU6XyC2wxzRSy3MFAgmlKeq4InC6jK4QOo3eRb8rblg0IN?= =?us-ascii?Q?KD72H8hH17trHkSRbELYqqwcwfZ2P80j4qsy9b//a0vM50XFlxaNfQQGc8SB?= =?us-ascii?Q?OXBuIs6eAqGI7MnVYBsltbWV9XToK5Q3gyuqfPs/YKQ+w9YdeJBiPyO/vkbs?= =?us-ascii?Q?9dmdrF5JRfbYkKKIgYJn3pCObHlNvams6jn+uM8kWQTua888yXqk4kR6fv1Y?= =?us-ascii?Q?CIoZ5Dx/sh3YxcPVeiBoGe3Fr3hMLRMQdcbNOTjT4G02hSsk34L3C/yt3Lqh?= =?us-ascii?Q?wCVT8/Lc9Twn19IdnkbSaN/JoJ8MnrTxN/d9EUCljbzy70eRBynLtH2qj7iP?= =?us-ascii?Q?8ZP1qGNaJ27ZwfJAllXOANVSGG8/njy2lWJkKW8yst7dzWDA7UtrO/LsO6pt?= =?us-ascii?Q?J0MB3aD36Rb85AFEMrlIRI6FnURJ3y7vY3FriAEsns8m9Zp8aLsbsCmZgfSf?= =?us-ascii?Q?3ZIl6Acskp0zpVF1CaOrZR2kjx29Yxe0XxkbdleD5BmAKOPNpuJuxmB563zg?= =?us-ascii?Q?m7uwHTVGYXwb/trpXWp4kNaPHirkWB2x391xdQxQzEFvd9jXwUq0sbOvRujs?= =?us-ascii?Q?9KYwSxIi/EO9SKKFywXMEv5fkcVPeoJS5ipZdgFBLBNSMZyGQ+s/Ea0jCfyL?= =?us-ascii?Q?10UT52Vmod7SV/BzQejTmZ6Yw79VKLeiRS6YQiKhu0kO3mkW/P+juN57fB2g?= =?us-ascii?Q?e8dJKWqLsWnI4gdly6cGqxPmGX4vRPpKhJSkeZHSyYZ+igd20YG4wM6pA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2379; 6:WcJCpevVcEKMfSg00PBree8VRo2dJyYfoBK5mTovpWQA1kBwtefanaEgOqpv4HZ+jxQqo4m4C+WLjLXDgG/LWbAWrzZHsOPhLODM8S8sKdzJW3nNq9HusiSVD7kKvIeEC/RP6xZ0RWLKAoFcTsQE3+ECDB+EVmSipDhEeu1KKHZY7FPdbyDkcTTZ0JB5Gsa1pxlQtpFfvHd4XvQR+yItYZ6X/m7/zj2BYfJq8sx3vIz90aJgVu4/j8RikdDtow0dEWQwlGKQ6nhtmcbiGRPj0g==; 5:TUyvZZoYFRCVxd0QdMMjMbEtni177QlK44IR0uP6HuxxLtnTi5FIhROxdWj9j94HXKDVFgZO7e4MbwQ69tpj5IflcRNhUoci9MS+IE0v7+O4Jms8YIMAhtpyt7M8gsVoIy8HoiSBIUfIgwMpry+BYoyJkr+wda48UW8lhKf8wwM=; 24:vSst991w75pudbKwA+bBZie0zewsyaA1tqkM5RaKh6McUQCfsFCa0EDVNLPZrdqFM5zhouwUdMfnDSODONouF1W+h5a2uCPfDH1R8Dzu5w4=; 7:MDP+2TkSycKKhuQ7zbw7h427h/pObs1cbnq2ltUA2qWiuyx5J6XdZUEZ3ARIr21gwWW/LuaDKkjJEnEe9anB9OlfF+O3XZTXuIJAIaomA1UgsJtlOJoKypIGUlJsF9O7vRZpK8ErQipblIN/iyICxBSCF127NrmYQaJeJscT+efMLGvYqTFnhrRNEcQkhvtAk3lXTgCfi5N3KKVTrcmZNg== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jun 2016 11:36:38.2574 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2379 Cc: trini@konsulko.com, ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH 3/4] SECURE_BOOT: Enable SD as a source for bootscript 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 support for reading bootscript and bootscript header from SD. Also renamed macros *_FLASH to *_DEVICE to represent SD alongwith NAND and NOR flash. Reviewed-by: Aneesh Bansal Signed-off-by: Sumit Garg Reviewed-by: Simon Glass --- arch/arm/include/asm/fsl_secure_boot.h | 43 ++++++++++++++++++++---------- arch/powerpc/include/asm/fsl_secure_boot.h | 4 +-- include/config_fsl_chain_trust.h | 18 ++++++++----- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 3f76c9a..b35c271 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -78,37 +78,52 @@ "setenv hwconfig \'fsl_ddr:ctlr_intlv=null,bank_intlv=null\';" #else #define CONFIG_EXTRA_ENV \ - "setenv fdt_high 0xcfffffff;" \ - "setenv initrd_high 0xcfffffff;" \ + "setenv fdt_high 0xffffffff;" \ + "setenv initrd_high 0xffffffff;" \ "setenv hwconfig \'fsl_ddr:ctlr_intlv=null,bank_intlv=null\';" #endif /* 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_LS2080A) +#if defined(CONFIG_SYS_RAMBOOT) || defined(CONFIG_LS2080A) || \ + defined(CONFIG_SD_BOOT) #define CONFIG_BOOTSCRIPT_COPY_RAM #endif -/* The address needs to be modified according to NOR and DDR memory map */ +/* The address needs to be modified according to NOR, NAND, SD and + * DDR memory map + */ #ifdef CONFIG_LS2080A -#define CONFIG_BS_HDR_ADDR_FLASH 0x583920000 -#define CONFIG_BS_ADDR_FLASH 0x583900000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x583920000 +#define CONFIG_BS_ADDR_DEVICE 0x583900000 #define CONFIG_BS_HDR_ADDR_RAM 0xa3920000 #define CONFIG_BS_ADDR_RAM 0xa3900000 +#define CONFIG_BS_HDR_SIZE 0x00002000 +#define CONFIG_BS_SIZE 0x00001000 +#else +#ifdef CONFIG_SD_BOOT +/* For SD boot address and size are assigned in terms of sector + * offset and no. of sectors respectively. + */ +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00000800 +#define CONFIG_BS_ADDR_DEVICE 0x00000840 +#define CONFIG_BS_HDR_SIZE 0x00000010 +#define CONFIG_BS_SIZE 0x00000008 #else -#define CONFIG_BS_HDR_ADDR_FLASH 0x600a0000 -#define CONFIG_BS_ADDR_FLASH 0x60060000 -#define CONFIG_BS_HDR_ADDR_RAM 0xa0060000 -#define CONFIG_BS_ADDR_RAM 0xa0060000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x600a0000 +#define CONFIG_BS_ADDR_DEVICE 0x60060000 +#define CONFIG_BS_HDR_SIZE 0x00002000 +#define CONFIG_BS_SIZE 0x00001000 +#endif /* #ifdef CONFIG_SD_BOOT */ +#define CONFIG_BS_HDR_ADDR_RAM 0x81000000 +#define CONFIG_BS_ADDR_RAM 0x81020000 #endif #ifdef CONFIG_BOOTSCRIPT_COPY_RAM #define CONFIG_BOOTSCRIPT_HDR_ADDR CONFIG_BS_HDR_ADDR_RAM -#define CONFIG_BS_HDR_SIZE 0x00002000 #define CONFIG_BOOTSCRIPT_ADDR CONFIG_BS_ADDR_RAM -#define CONFIG_BS_SIZE 0x00001000 #else -#define CONFIG_BOOTSCRIPT_HDR_ADDR CONFIG_BS_HDR_ADDR_FLASH -/* BS_HDR_SIZE, BOOTSCRIPT_ADDR and BS_SIZE are not required */ +#define CONFIG_BOOTSCRIPT_HDR_ADDR CONFIG_BS_HDR_ADDR_DEVICE +/* BOOTSCRIPT_ADDR is not required */ #endif #include diff --git a/arch/powerpc/include/asm/fsl_secure_boot.h b/arch/powerpc/include/asm/fsl_secure_boot.h index 2435cf8..7c39bdd 100644 --- a/arch/powerpc/include/asm/fsl_secure_boot.h +++ b/arch/powerpc/include/asm/fsl_secure_boot.h @@ -127,10 +127,10 @@ /* If Boot Script is not on NOR and is required to be copied on RAM */ #ifdef CONFIG_BOOTSCRIPT_COPY_RAM #define CONFIG_BS_HDR_ADDR_RAM 0x00010000 -#define CONFIG_BS_HDR_ADDR_FLASH 0x00800000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00800000 #define CONFIG_BS_HDR_SIZE 0x00002000 #define CONFIG_BS_ADDR_RAM 0x00012000 -#define CONFIG_BS_ADDR_FLASH 0x00802000 +#define CONFIG_BS_ADDR_DEVICE 0x00802000 #define CONFIG_BS_SIZE 0x00001000 #define CONFIG_BOOTSCRIPT_HDR_ADDR CONFIG_BS_HDR_ADDR_RAM diff --git a/include/config_fsl_chain_trust.h b/include/config_fsl_chain_trust.h index 566fd80..eb45e98 100644 --- a/include/config_fsl_chain_trust.h +++ b/include/config_fsl_chain_trust.h @@ -74,23 +74,27 @@ #ifdef CONFIG_BOOTSCRIPT_COPY_RAM #define CONFIG_BS_COPY_ENV \ "setenv bs_hdr_ram " __stringify(CONFIG_BS_HDR_ADDR_RAM)";" \ - "setenv bs_hdr_flash " __stringify(CONFIG_BS_HDR_ADDR_FLASH)";" \ + "setenv bs_hdr_device " __stringify(CONFIG_BS_HDR_ADDR_DEVICE)";" \ "setenv bs_hdr_size " __stringify(CONFIG_BS_HDR_SIZE)";" \ "setenv bs_ram " __stringify(CONFIG_BS_ADDR_RAM)";" \ - "setenv bs_flash " __stringify(CONFIG_BS_ADDR_FLASH)";" \ + "setenv bs_device " __stringify(CONFIG_BS_ADDR_DEVICE)";" \ "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) #define CONFIG_BS_COPY_CMD \ - "nand read $bs_hdr_ram $bs_hdr_flash $bs_hdr_size ;" \ - "nand read $bs_ram $bs_flash $bs_size ;" + "nand read $bs_hdr_ram $bs_hdr_device $bs_hdr_size ;" \ + "nand read $bs_ram $bs_device $bs_size ;" #endif /* CONFIG_RAMBOOT_NAND */ -#else +#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 */ #define CONFIG_BS_COPY_CMD \ - "cp.b $bs_hdr_flash $bs_hdr_ram $bs_hdr_size ;" \ - "cp.b $bs_flash $bs_ram $bs_size ;" + "cp.b $bs_hdr_device $bs_hdr_ram $bs_hdr_size ;" \ + "cp.b $bs_device $bs_ram $bs_size ;" #endif #endif /* CONFIG_BOOTSCRIPT_COPY_RAM */