From patchwork Wed Oct 26 20:17:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 687002 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 3t3nFY35WHz9sdn for ; Wed, 26 Oct 2016 22:03:45 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E64CAA756F; Wed, 26 Oct 2016 13:03:43 +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 DtbwM0_jM5LO; Wed, 26 Oct 2016 13:03:43 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1B719A7537; Wed, 26 Oct 2016 13:03:43 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B6DD2A7537 for ; Wed, 26 Oct 2016 13:03:39 +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 ykeIzPHEhlPN for ; Wed, 26 Oct 2016 13:03:39 +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 NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0058.outbound.protection.outlook.com [104.47.32.58]) by theia.denx.de (Postfix) with ESMTPS id 129B1A7534 for ; Wed, 26 Oct 2016 13:03:36 +0200 (CEST) Received: from BN6PR03CA0038.namprd03.prod.outlook.com (10.175.124.24) by BN3PR03MB2372.namprd03.prod.outlook.com (10.166.75.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12; Wed, 26 Oct 2016 10:47:44 +0000 Received: from BL2FFO11FD037.protection.gbl (2a01:111:f400:7c09::126) by BN6PR03CA0038.outlook.office365.com (2603:10b6:404:10c::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5 via Frontend Transport; Wed, 26 Oct 2016 10:47:44 +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 BL2FFO11FD037.mail.protection.outlook.com (10.173.161.133) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.679.5 via Frontend Transport; Wed, 26 Oct 2016 10:47:44 +0000 Received: from localhost.localdomain.ap.freescale.net ([10.232.14.22]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u9QAlIBq031831; Wed, 26 Oct 2016 03:47:41 -0700 From: Sumit Garg To: Date: Wed, 26 Oct 2016 16:17:09 -0400 Message-ID: <1477513031-29292-2-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1477513031-29292-1-git-send-email-sumit.garg@nxp.com> References: <1477513031-29292-1-git-send-email-sumit.garg@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131219524643047301; (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)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(68736007)(11100500001)(92566002)(305945005)(8666005)(356003)(7846002)(5003940100001)(4720700003)(104016004)(586003)(189998001)(2950100002)(50226002)(85426001)(6916009)(110136003)(2906002)(5660300001)(97736004)(81166006)(81156014)(8676002)(87936001)(626004)(77096005)(8936002)(47776003)(2351001)(229853001)(106466001)(105606002)(86362001)(19580405001)(19580395003)(33646002)(4326007)(6666003)(36756003)(50466002)(76176999)(50986999)(575784001)(48376002)(7059030)(21314002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2372; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD037; 1:90oWwxkpGgk9hOtBqLivytpBAtlDOL5CNAfhzSPYQttr3MnvY1iDpvHlwQUIZnb9i45nNWqgvBPIPw7QrWBQV+iMAApxEtUK4B14HPw8SrWNYbyTf2pWLol1ueL+QWRvr+yUduG/PSHcymEAacPtdO+U5xCb29VhmboH5fMd3IUvc+Vdl0mzmkgLSCJurSCjNHIQso94wRgFrmzgEic0L2RpMExDk87juOHAiKuGyjwJQMXjcKiEiQC522cdYF/qIUBtpGBN+tZWEEYrsqCjhqANW1GsbbDtPCgb9EqLpzwXLQ5E58SDjhQ8tDWooEjZzjKpW7RqA2xNUpaggFOMeawDRGVxW61/QqoNWWvXc94XeY9ml2GBy7v3XSvS1bKm8tP9dk+H5cM3Zx8zclXyIPjAf3gKosLOPkUfdtjP2Kxk5JDnvwrUN66pME8OHDJO7pfbITKodjyMY4i1PpIMintTo6i/BLxyJomYUnlLeWoX/J/Kib2UOCJ01Y2vFLvLo7WXGqOoXchSbw1rii3n+ERI0ioHd5cEXjPpHCR6x8DoAxZo2x/oTLhgOX19EdMdWs5WsnM2RuoZrb01TNJOMQpijtZn/Y6okto4YpRYhkFQfPuQvUNRayBk4NOTnEzJ3n/NaXQkCAU6NreqZ24pW3VGd0KtQjCPODdccx6RqnFnSN39gL8nEvRir0bTaIYRCKNqtfM98UBbSR3/s5vBtEjsiS+oUiM1xoKN4XLBMzY= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 2ba7c790-0809-48be-6624-08d3fd8d8466 X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2372; 2:pX4U0NeiyWmx1x8kfAD2pGDltVwKejmAC8sBJ2jeU0qjEYk8mKRCcppLbrRSLoJpN6lPaSuPawkm196oLBKCnipr2kFpDcGRFwOeOSyyOyuH0jcRJ/IBlyoXsWbt3DWWdmXjx1eCZd/Hp3/CJlyQxRRJNxlX8k6M3wYoHmrBJWASyvKA9NH4upqtucGCxOoWBlU6x5ANcFZW0GhVo7EeKg==; 3:5FAnWU5iqFKNrhw/ctEQOknSGaYt2/wKdFNUG8KvZ1t0tXViyzfzIw+f7SkykxspKooWRlKv3aXU1xYnV2hi5HAODSWT47V4hGIg392P76ZxiTmnmtkJOGQANesXloI5zrFubFKE76apFGUAvWdgfCJ0e6/w4p/sXVXR5pnaG1fuzZEsNlz0hTr+OFBulLBMYz532jsIjLyN4Tfajf+Rhmqv1vLhZ0VlaTk5sTiT0AxaAmjb5TnhYj3rIzEf3oHF; 25:5dGJLn48srTBip/XI6pvbAk4JeT25JFHPCAL07BAOlyFXUAQwwtgrLPn8I0LI11U1ZEOvsNKoAWNXbVKXtnHg+MywxMIO+Yr9uQnVJbTe1rUuF7ZhnjUG7lBiAUEwoQagID6E0eeRlxC0Dl7/TdKZfAIxdLsbMO2SJbYyZGyc4NMhA4R+6lLapd2mfpNnHo73O459E08JrlwiO82FkL0ZmIy4aF5WtZCajQ8HUBDGvzum2MQfSWbTzKYMGbvvWXb4wq2vBXBYL/jV7SOR6PvQ6uy+HwvvdTbhkxDw/wxIvL0r1D596XyLOW06SelbXjjMX8VLiAVogVzAiMJGjfTXRl7RfiOSYKmjo3/1Iw9FoKlR4HRHmGIVhSAwmRKSNk9bgrhemRGZCisRUcGRJmo70uSGg8lmJptZkzLJh7BNgnGwHlvD+mg4LTDwSGSZOa8NmUMFAz4Jlp9Dzg7OVl K7Q== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR03MB2372; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2372; 31:2KIIaAs8jx8ST46HbsAKdFLG7C1POAr6S/j1/l676tXQehThPr2WWnd//j0YNx/pofTQ3bSeLqPGcP1z4PjrVUp9AqefITwamRdKzEQHRiwNu9PPQ0l4CuLngxqVSvE1nXua3oe54VXS47830yZtQ6utS5rXrm/SZpQGpziYdzBWy6pWjLXMmR2e6OEjbVgLAHZWY0J5JyOeScbE4P7rDorf/NkP9qYumjFD8Os2UAA1txpSDOCL2fcRwjs/jNz7ihSvagKcyXGd9Wmtn3pyaw==; 4:JNnATi9xeIiszFvUjkTwt8jqC5wzZ8RzmbiKH9Q8ldCh54NB6Bs6Cm8afwuEOwxSG1TU4giIT0j+apI+tixQ+MyeeGdpJHSv0TvJ9oHDRXbuIeLpvBAAixPq0buYnsPguU3c2g9hxryDcLreZVHZvQ2exz07ww4GkxAQ95+gpwupul26NYiRhnBZ1RIv+AB+FLTTDtI2P66tHAzaPaEHmUfeW1WsNg7YCF4k0jsHdyRvWEn0DAhZivHlWzMUVvkMbTOzPRNBMHrdUykejQPImgbaC7PakH2WLmk7EyDLVEhZPiqw4ChbnV6bhWH+NacxHI4lrmo+GvguKm3ZBI9fdElKOc6V4jlJ6hVcupOqeGBpuhsXlSG2KS6hfeUrzqWoQz9wg/zRK8ARrs3auI0hScEt/h3CV09GiYcvo37WxlMugoAOdkZ9fOI75ZCl3RvdXfoumz5+HUCIDQm84Npsz/H2T65rGzf5NqpNC4O0cROQNUC8yhe8O0vvfPZ98TdJ0MRX2EP+93B8Kaw1SEU/GgJ0q09tl3kwB3smx4bPIJn9pJ63eXWm0UcQUvxjbT4g X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13015025)(13017025)(13023025)(13018025)(13024025)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:BN3PR03MB2372; BCL:0; PCL:0; RULEID:(400006); SRVR:BN3PR03MB2372; X-Forefront-PRVS: 0107098B6C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2372; 23:hUC1vGY1Pz1egukjiiY3Z1ggQ234oUHfmVxfsjw49?= =?us-ascii?Q?3VBvHZ4jZO6yiQ0YKfU2I3bgJHt+mhhBBbC9KQabkt5+lYfKcwg/lwZzMAVS?= =?us-ascii?Q?OnvU5hGPynW/DT8QeOtjA9XVUgKkraI4OKhXZZZubKQJQrt6aL9O4QBVoD/R?= =?us-ascii?Q?Q4lwkZ0qOTK2E0W+TiDGPPJkc5I446EeB4f9eVGA2bTHg5AvUr6cdalmcaN4?= =?us-ascii?Q?5aflLmsfW8x/kD6MtAIW3VmD1VeJhiVVOW8rZ11dlDFzaG/LurfiTW9KnTsp?= =?us-ascii?Q?onpRXz/+xa54pahNi1hO2dJDJd/x80bLzHkCRTRps9z4ybfUNNWE3nadgb4T?= =?us-ascii?Q?RldJA4FktOPaQFN72JXblogKFSbvv9Po1w66g8O32ZmdK+oSkDTmNlG9fCxl?= =?us-ascii?Q?n44gGZImrfxGwRafWdYGrWZVDZAikPq0VOrmnbgxX0kcUsURZAWB1LYzZmB3?= =?us-ascii?Q?axMQuEY6UPLtm/syulxN4++TFrerFd5mhqg24+Yk+a5hTTvWbHl4aiburARb?= =?us-ascii?Q?CKOqpFry0eWJ/WaxtSz3YDNwnMeXTwUQQloZbjl6E6IUysfQKEQ0I+XRJBOG?= =?us-ascii?Q?pmduE6NcQSQiEX/YEhyUuwfg3yL/fmq0tI6oSLxY9puyZtGSiioCzR1lNfwx?= =?us-ascii?Q?Z9nRcKiYC9b/HbBhEFhgTBJgpfZl6J0l+VUZ/XZJazCMFHh1j2sWLbvKFcwN?= =?us-ascii?Q?OweYSw94/a6SyT0o2fiNDBENwi/LZ4IMfMisNJFaj0fs9ZnseIxauNl5qAn5?= =?us-ascii?Q?9gC8y9/xRKY2vXcoyfFTNSTtJGaWr3c4u9vJ5SB2qdiWZ1EYjyAtihuu0aKP?= =?us-ascii?Q?L09gAxWal0anb60uyDAtT5SkbN8H2ZY8rjJjdhuwJAOhv4f8uKFfSE9MKPAQ?= =?us-ascii?Q?lXraW3lOR0pi4MNsZnLwoBXiLQ2hdIpLRhQxD9chGBFFNAn+u5asHk8W3Uer?= =?us-ascii?Q?vN6R/cdiBgjOUE6a2LC2KA4LD2xjHOwQpmNIhNEnUepnYtvdfCPh/hrXcnH1?= =?us-ascii?Q?gLv4LM8Kj/YyJKyGPXzMBTMJsdA4qK4AthyG6GuadBSYayXWnzlkwh1AEntF?= =?us-ascii?Q?8VuoTXdM2ho2sZpmCRArvbR9pPvDCf/A8zmgXHoiQhSQ0+2LhDbmBgSJrmDV?= =?us-ascii?Q?BFjRf5BjfhCqbi78XdTF26STFS9Ix1Z0WadO1aDd9MM+2lleNOYn/UuH+G2H?= =?us-ascii?Q?FCIBBsB14mQYkiDPPU+GwjS8B+tLIwielqedVoHczF7P8/tDKG7uh3+GNC3f?= =?us-ascii?Q?ac++oXsonAW+8eFio+kBlU7p+ph9qedh/kXTO6Q7v/I4YH6x7TgpfiD5IK/u?= =?us-ascii?B?Zz09?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2372; 6:wcs/BOBrZEDt/A95zC73fSOz1gU6nw170Sc98dB6IZW7w+seaAiUQ/m6Sc/3ba462m7XCx3vSSHgTvaQCv7sjcGKbVXKI1JWkLkzLnNnIu2Z1F7HhBLifW+9GgQy/ebnmE5daqcuwoJ6glLo9U6EFhJEoWjmc10FfH7hzIaXOxPsSf45o4Gf/DSiLDO6K69qqDJtQuEwhugj5IVUY3k6dIREingmZMvwGWKvEUqFKGvZ/n6XYkpQ8JDXK/08HfAGldKxeTUrQwcxLV5pm8IpVrSMxPVLoAEBSm6IL5i8sX7rqsDYvcX3ZEofU+l+c6HG; 5:bxeHv2Vw8rXr9TZ12O0y3pZcp2fMld31mDCC1r1GBzantCZYUlgEDhmdf87r2eNDgSGUnZLv5KxEixncKcPltzHyEfC1r5oLD4XsljABULQDfb+usXtSMrmJYE/4u6THy1ZeBMMxfFFD5E7EPoKHfh0VgArsQHgJcFjd1K8PkpPZtAiFbpSzg/keySqBJjvp; 24:MIODvpUcyh9rJ8k3liZzQFaCdbhfKVAeRA5H5VzbIm5JNzX1m0yKZYAwFRADDgdVHzzq/upP6gZnWya3/1H0De6uf1SeoXpzqRyOt2iX++c= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2372; 7:T+ACXFApfcjJJxA/OE4WD4zLzz8pdwY5sFkteLD71oqiUWyVShIM9CjhrmRZGT51Lyp+oQkmHayOnOE/FMXvicF15nA/oEjVjpqyzpL030NjrMFwwdHzdLHbK3ePc0CQpgSzioRBXN/BMnv2PPx2NrLMmITI24c4aT3Ri8+XQJrF2L2X4EAzNuZGsZcmnKqJJKECVTvowybnFdZYAiZFMtSuYX6FtpwxN1zF0s4MMODwMt7lb2OGMMZe62ICDIb06RwNL+IdeXGTfQDYKBH3S0kKcHlEibC4Zs/RhafuR61HZFOCltdxEbBPQNa3GKEP94LjTtj0l3Oh0BjSugkiPJJ2hsusS0PR1OWZfBBhX9A= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2016 10:47:44.1175 (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: BN3PR03MB2372 Cc: ruchika.gupta@nxp.com, vinitha.pillai@nxp.com Subject: [U-Boot] [PATCH v2 1/3] SECURE_BOOT: Enable chain of trust on LS1046A platform 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" Define bootscript and its header addresses for QSPI target. Also define PPA header address to enable PPA validation. Signed-off-by: Vinitha Pillai Signed-off-by: Sumit Garg --- Changes in v2: Split patches logically from 2 to 3. arch/arm/include/asm/arch-fsl-layerscape/config.h | 2 +- arch/arm/include/asm/fsl_secure_boot.h | 37 ++++++++++++++++------- 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h index 4201e0f..11a62e8 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/config.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h @@ -196,7 +196,7 @@ #define CONFIG_SYS_FSL_IFC_BE #define CONFIG_SYS_FSL_SFP_VER_3_2 -#define CONFIG_SYS_FSL_SNVS_LE +#define CONFIG_SYS_FSL_SEC_MON_BE #define CONFIG_SYS_FSL_SFP_BE #define CONFIG_SYS_FSL_SRK_LE #define CONFIG_KEY_REVOCATION diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index 4525287..933e09c 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -45,7 +45,8 @@ #define CONFIG_CMD_HASH #define CONFIG_KEY_REVOCATION #ifndef CONFIG_SYS_RAMBOOT -/* The key used for verification of next level images +/* + * The key used for verification of next level images * is picked up from an Extension Table which has * been verified by the ISBC (Internal Secure boot Code) * in boot ROM of the SoC. @@ -59,9 +60,10 @@ #endif -#if defined(CONFIG_LS1043A) || defined(CONFIG_LS2080A) -/* For LS1043 (ARMv8), ESBC image Address in Header is 64 bit - * Similiarly for LS2080 +#if defined(CONFIG_FSL_LAYERSCAPE) +/* + * For fsl layerscape based platforms, ESBC image Address in Header + * is 64 bit. */ #define CONFIG_ESBC_ADDR_64BIT #endif @@ -78,13 +80,16 @@ "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)*/ +/* + * 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) || \ defined(CONFIG_SD_BOOT) #define CONFIG_BOOTSCRIPT_COPY_RAM #endif -/* The address needs to be modified according to NOR, NAND, SD and +/* + * The address needs to be modified according to NOR, NAND, SD and * DDR memory map */ #ifdef CONFIG_LS2080A @@ -96,19 +101,26 @@ #define CONFIG_BS_SIZE 0x00001000 #else #ifdef CONFIG_SD_BOOT -/* For SD boot address and size are assigned in terms of sector +/* + * 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 +/* ifdef CONFIG_SD_BOOT */ +#elif defined(CONFIG_QSPI_BOOT) +#define CONFIG_BS_HDR_ADDR_DEVICE 0x40780000 +#define CONFIG_BS_ADDR_DEVICE 0x40800000 +#define CONFIG_BS_HDR_SIZE 0x00002000 +#define CONFIG_BS_SIZE 0x00001000 +#else /* elif defined(CONFIG_QSPI_BOOT) */ #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 */ +#endif /* Default NOR Boot */ #define CONFIG_BS_HDR_ADDR_RAM 0x81000000 #define CONFIG_BS_ADDR_RAM 0x81020000 #endif @@ -125,12 +137,15 @@ #ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP #ifdef CONFIG_LS1043A #define CONFIG_SYS_LS_PPA_ESBC_ADDR 0x600c0000 +#elif defined(CONFIG_LS1046A) +#define CONFIG_SYS_LS_PPA_ESBC_ADDR 0x40740000 #endif #else #error "No CONFIG_SYS_LS_PPA_FW_IN_xxx defined" #endif /* ifdef CONFIG_SYS_LS_PPA_FW_IN_XIP */ -/* Define the key hash here if SRK used for signing PPA image is +/* + * Define the key hash here if SRK used for signing PPA image is * different from SRK hash put in SFP used for U-Boot. * Example * #define CONFIG_PPA_KEY_HASH \