From patchwork Wed Aug 16 11:13:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 801850 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xXGxD0jDYz9s7C for ; Wed, 16 Aug 2017 14:45:18 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 95FC0C21DCF; Wed, 16 Aug 2017 04:45:12 +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_H4, 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 B3C55C21CEC; Wed, 16 Aug 2017 04:45:09 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 68CDCC21CEC; Wed, 16 Aug 2017 04:45:07 +0000 (UTC) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0072.outbound.protection.outlook.com [104.47.42.72]) by lists.denx.de (Postfix) with ESMTPS id AC299C21C49 for ; Wed, 16 Aug 2017 04:45:05 +0000 (UTC) Received: from BN6PR03CA0022.namprd03.prod.outlook.com (10.168.230.160) by CY4PR03MB3318.namprd03.prod.outlook.com (10.171.246.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1341.21; Wed, 16 Aug 2017 04:45:02 +0000 Received: from BL2FFO11FD049.protection.gbl (2a01:111:f400:7c09::168) by BN6PR03CA0022.outlook.office365.com (2603:10b6:404:23::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1341.21 via Frontend Transport; Wed, 16 Aug 2017 04:45:02 +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 BL2FFO11FD049.mail.protection.outlook.com (10.173.161.211) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1304.16 via Frontend Transport; Wed, 16 Aug 2017 04:45:02 +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 v7G4iwnG014004; Tue, 15 Aug 2017 21:44:59 -0700 From: Sumit Garg To: Date: Wed, 16 Aug 2017 07:13:28 -0400 Message-ID: <1502882010-27829-1-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.8.1.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131473323024872394; (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)(39860400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(110136004)(50226002)(8656003)(77096006)(6666003)(5660300001)(498600001)(53936002)(6916009)(50986999)(4720700003)(356003)(8936002)(104016004)(305945005)(105606002)(2351001)(966005)(33646002)(106466001)(189998001)(81166006)(81156014)(2906002)(8676002)(50466002)(47776003)(4326008)(85426001)(626005)(86362001)(575784001)(6306002)(68736007)(36756003)(97736004)(48376002)(54906002)(5003940100001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB3318; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BL2FFO11FD049; 1:3h1s3tQi0HhKW1arDi1ELmvG/2Gx2v/niBrCEeZPuM?= =?us-ascii?Q?xQbFK6GWwMCekT9uag/ZketTk+v/c421bSWgHsIvkDIp9p05pqkPppReECdY?= =?us-ascii?Q?udFK3vIFqChaVemSv0K4TwiPqIQbiWYjEkpKFQjAAoYmc0yFYlyueiOOrk7x?= =?us-ascii?Q?h7HlHAdpHgLVGeBdjxtiGTPSIOgcYQnNe50Sk5G3XMHkBmhMhB0/j2XlUU1L?= =?us-ascii?Q?0lxbwwWmB0z4bqwTPij7FMlPaWZ7g8Z63h1eboyxXh6w0uwOuzSlUUCZPuXq?= =?us-ascii?Q?9zI2M9OYizB6nIX9BPzTU27NndwCxT0i0kZxPQpJnHvvbmiiezm/kf8humG7?= =?us-ascii?Q?+81gxrja7PIeur1Pc6irBqlmMoQykeQi/G3YaLBdG9k0Mwg2/FiLb+A9USuD?= =?us-ascii?Q?D+2bCpsoeUJ+ONL47SkoezN2I9zw3tePO/3hJ2HeQXYzvghOLau46lQu+tqB?= =?us-ascii?Q?Yqa4sQlvQ09S2KwePUyWxhSpMDJzGsGo+Gc6BhShXJZtqFUhqCxvWyop5Lty?= =?us-ascii?Q?aTk+9+ZI9ZhFM36SUnoKk7YYsN1QbDSuRVDXuJM7jLe108uI30VYsPqyvDAj?= =?us-ascii?Q?IaMMYZkv0vVbFnw4oeOOFD4uATVy3R9wWlQ4jgNneM+e9HobOHRWV516Gptc?= =?us-ascii?Q?s5iezf7gQ8UmoUNG7WqvgiBSz7ixLjXKHDqOReN3MTTIkPIU6+CU4dKUrFmC?= =?us-ascii?Q?2HP6SgoWoK+D5Picj2m3Cj2nJlyHVpG5KGf6L7gmbhRTxSou5x00eDpckVKX?= =?us-ascii?Q?j1fogX0HJnLeBMA1w1JZx/yy4UfPwfrneH8ocn6G6fWsdeDyfKQuWZhU8lY8?= =?us-ascii?Q?5KFNa/sr58Eqj6nFbpV+u8oEHbrCddXmIzYRTcGROYyVYUmMnw7WAaK7FD0w?= =?us-ascii?Q?YmIh97OsqoS9rMbDaCZ+SnBmNkMO9yRwNZqe5VsPgCoqqv7hiAFVHfRzRXlf?= =?us-ascii?Q?gaQEYJphr2AYejeHJBQGpu0mrph8RTCGa8tQlTaQ=3D=3D?= MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ac6f34ce-c650-4830-68da-08d4e4618eba X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603031)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR03MB3318; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB3318; 3:7Qx0WIfwKNxz6DIlKGIgNMmWdJwGYxufjYoYWLVNR1pEOApbImyVhqiVGCEE5UeaDUKYz0MuvewHDpZIKzVddKuACf7zvuAHINNvuXgs4PEImx7qoERe0hiWJBkM5/+0OutI5OQKPkN9GuJqauX4dSKgwtvLWmzdnj6rOh5YXFp+F5Mc09Yt0EgYc9xUBK88TzbbVjtsbZmLTOtKzCiWupZ+ZE5AeArPyBkbkvGhHxABMEwHV45yv8z99NN0evlvMjYPHW3t3Q+K6dt880Mldpg58Xbv6eSN1Aa5V8HqDkb2ywnBNMasho1bVj6K3V544pBmSqPXiyrsaXRfuMXjg99pXRRQKH0M8PS5QVq/uC8=; 25:hU2czwNym0Yy9TO+Ghk/6omTt0t2bbXwXEnbPoqLGRKoGMwkeeXcb0IFc0fNPE4ZOPxasK/n2xLJKCMGzfcXxhf0h/Qz090pZdDZUYUQPXQALuIbZcls1+5liDvABFglOpPQUckbbh0tYEMOoqumjB07xDAHUETr9H6pNv6HNK+uxtw3rh60KEMB1mo8FWXlID98Y32grUs/HhxXv3y3u+deVv8/E3DmKbOIbj6hZunYvtO8eYlXoIVC4D9IEvzsGemldUvofPTTsddnxo4AspgAG9Q6HF4CrEpPAlzwCy7f+vNUer3lXbIMevKOeVlRK6t5xNEsi0md4yC437dfeA== X-MS-TrafficTypeDiagnostic: CY4PR03MB3318: X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB3318; 31:C+PoaC4YT6uvwRslAM2PbPSgAV+u7s+mn7O8RcMP4lh+2SQGQws6RZEyghkWfxFzS2IegyGya2F1pyyHuA6XdOj/k7UwFr7ViFYmXbric9TiCSgKe7aoQsWND/W2869t2y8vGAmlog2CpsiabnMobw/z3Kyi0gn2uSTtbep1f5y/huTM2IqHfdq6tdBqIAzCaZk+wgHJx5tlYxJ1zGTuYFS/333fWNS7ujJBz1Jo3Cw=; 4:TvJBW+wKSy+2pCHiyW6oQn+t3ocJRv8Z0hJMCDt6oPSYPR2LyipLN+6mVuhj6kLg5ltyra9hU6P7tjL7FnM+kv2C4l28NmsnJPO69gOhHQ6PagwEnTLb2qhHKFdG6wusXV6QmmcMrHRpJBxXaDCZfdAywb98G25WjgVPV/TMPf9zajex5YeGeciyeQuAP3g/d++TWe+RVBJy+xI/P6Oo83QtLBQjjMnFYWIaLWcibo7lHUudArVPkH3wIHKoZUu/QuldCAuqNLtvf2SswgufRsglKeCn71grOcvD96ETPJE= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(13018025)(8121501046)(13016025)(5005006)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(20161123563025)(20161123565025)(20161123561025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123556025)(20161123559100)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR03MB3318; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR03MB3318; X-Forefront-PRVS: 0401647B7F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB3318; 23:cpKXsy0kTo5WelumKJyvuX2yUzZv/YptA5ucldVTO?= =?us-ascii?Q?fx5QJFwnDYFRCGb13quDuG5Ap+L+WcIvtj2MzSAW5EqBeO96eTTx9TgT/PJy?= =?us-ascii?Q?EUv9T8GJsrQ1oWHs+kjF0/aUW0wGxS7+nXQocyDfmo6iuuhLoplQsL1CLvnP?= =?us-ascii?Q?E/xKVFEW7U8ijCboZP46MjVVXHPAfKehMz8QXmQPyOmLRP5WNUOi3dNVVTyr?= =?us-ascii?Q?wz2A5TuwfzmZBu+uzelE0xGCf5E8V/DLkCKN/jsk+GnbYQeMYuu71Z91dozQ?= =?us-ascii?Q?oDz4j0vH/bD0iOEvEZDsxUxIGUw3HqcGUBj0N2Ji6bIn9XYnLIvEIXEI+EQ1?= =?us-ascii?Q?lTnjQFSbKtCE1jrspa3FBR1vW0GXHAFcGTy19PKQl5anZJKDQSw0FE+8C1xy?= =?us-ascii?Q?6Nfg8TR5qy5QkD8x9zUwK3Nu6aqwRbbr5nDxKoEYGUShg55XeUkMVH9+nX7m?= =?us-ascii?Q?MZOfEy2YdznFrqdsmKDzbagPDhdrGy9jjrcPyCtMsmMYLY7GDhiP/sp3ehQv?= =?us-ascii?Q?eoL7eU4LxHQCVEYLaTcPer6FQgho1zzjkbOBz2g1h3TJjr6fSIHCVAsbbkcu?= =?us-ascii?Q?BGnN5TfhAZzTc6bUsDcZfjTbz6JN5zmUKTOlE+psYvEO3xB9mhpBVahPEyuz?= =?us-ascii?Q?LB1O3m5WFmDYhL0BuMhBzA4tVWYQYzx//434SfMQ/UQwCfowXFQNO/+zQ/b0?= =?us-ascii?Q?9iFb2tRgs3gBZxxUwfqlvC1BFpRbyZTIiLVkZV0YkBVuJ98YEbS+tyo6HzK/?= =?us-ascii?Q?DhH+2bcTdtJRDu8W7sdqsUUGWOiC07SOqbLiYHaNCLNp4XAJu3FD3Ur+VD33?= =?us-ascii?Q?Mi6ldJ+Mojmt5IRb6ah8kbLgxcLtVnoN5H+J80AbYgTEvDOKKJGqhhNgITqj?= =?us-ascii?Q?qnJIGOm0yCSYvkyshiRW5DwmzyjX8YEngHXLpINF5hx3qSqu56MMAq7xcbCj?= =?us-ascii?Q?DAUFUQC2UGqDteGkLE/NZQI4F0xBmI4Q3B8LMyKk1iBGkVMqIZ2zZ2b7jMjh?= =?us-ascii?Q?o+iX71Rvt6ZdEyTTBbstjEq/OZPjSgGJsksXLJI8P1RpmbVZ0h51JSeLZBw7?= =?us-ascii?Q?O+Yfl+l7N5LhL5zHfWY/UU9TA+OOJ+NwxqPCSm6qUfNvZUd1i8PHe6yeBcqn?= =?us-ascii?Q?x7W2l5XaX6ojEyKAF75VvRhKoPrn9dlH0vZfVAu6BKM+tOj34FihQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB3318; 6:FW3bcr1VU4FZaWcCmNidNPRow0WK4MbEDlkKCfHjaT9lWLMO8g5knwZa1Ex93qn+XzWR0R2pLmIa6GQMqUWwrs6CHX/bvwjx7RmEDySiM0cWweyc3uf3IHf9PJNF1aj1yzguciKz3KYT7LHpeycHhGKGDMxYMWyrdCpGCWYDPrp5Ug1JQIP6ZaR3fASlh25VRynKQveCMbc+PLBMhP/OK+IlXOBUnGD2VLwS7CziNKY/GWactmuF+qeU7AhF8EnBAOeKW74aG0MjeG+aX+3HTQLN8b1cFI/kcjINbxa9Z1jFasBSPXbPBr6PPfWSzbHj0s8IdPuTizMYHE17/yiEsg==; 5:wr5+8s/lnjnsfltynrLSBjTinXwOWe1hEpj2kmoFfG7x4hGWtESjPIo3/u1LDlJBLszo2zR6/RJ+I/Pt2vrsUoLpCQjCyKNIghG/De0lXGNZ2j7MPXXt7yhpGsCO3zpkvjyKU6VoAFbhOhiAp4ZLwg==; 24:Wj8WZzIEwKNOzKYHdN70uBbo9vtB3sd7jsKOom5VZRyhe7073A4w1Bm+oe3GoHplNb7Y2L7EMfcGNGChR3e2UDP8zlkQ8lMiZh1TfxeO2Hs=; 7:/jY925nWKpgxNm62QIq0Erv4AAMp/Ll4m65S1EZaSUOqxE40FB/uXNkl4iJrpo5kLCtp2lU9xPkaojlTjCzD4JLTdAsV9g/kEL5E7ZuEkeLHO+sxaBDrDDHxJ/yY+rioq2uzyf6DZw9UthfQem6P2ghfU45NWvdtJmjqY5ytnWueL6sZOfsLptlXY+4fGnwdc5wS4rJH/MGyTIW3wnz5EHOVARxOjD0d7t3jDB+YGoU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Aug 2017 04:45:02.2064 (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: CY4PR03MB3318 Cc: ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH v3 1/3] SECURE_BOOT: Unify memory map for Layerscape based platforms 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" Unify memory map for Layerscape based platforms. This patch includes changes in bootscript, bootscript header and PPA header addresses change as per unified memory map. Signed-off-by: Sumit Garg Tested-by: Vinitha Pillai --- Changes in v3: Rebasing of the patch on top commit. This patch supersedes https://patchwork.ozlabs.org/patch/756260/ arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 12 +++---- arch/arm/include/asm/fsl_secure_boot.h | 54 +++++++++++++------------------ 2 files changed, 28 insertions(+), 38 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 5825f9b..b7549a0 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -194,12 +194,12 @@ config SYS_LS_PPA_FW_ADDR config SYS_LS_PPA_ESBC_ADDR hex "hdr address of PPA firmware loading from" depends on FSL_LS_PPA && CHAIN_OF_TRUST - default 0x600c0000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A - default 0x40740000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A - default 0x40480000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A - default 0x580c40000 if SYS_LS_PPA_FW_IN_XIP && FSL_LSCH3 - default 0x700000 if SYS_LS_PPA_FW_IN_MMC - default 0x700000 if SYS_LS_PPA_FW_IN_NAND + default 0x60680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A + default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A + default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A + default 0x580680000 if SYS_LS_PPA_FW_IN_XIP && FSL_LSCH3 + default 0x680000 if SYS_LS_PPA_FW_IN_MMC + default 0x680000 if SYS_LS_PPA_FW_IN_NAND help If the PPA header firmware locate at XIP flash, such as NOR or QSPI flash, this address is a directly memory-mapped. diff --git a/arch/arm/include/asm/fsl_secure_boot.h b/arch/arm/include/asm/fsl_secure_boot.h index b0b3b93..63845a2 100644 --- a/arch/arm/include/asm/fsl_secure_boot.h +++ b/arch/arm/include/asm/fsl_secure_boot.h @@ -1,5 +1,6 @@ /* * Copyright 2015 Freescale Semiconductor, Inc. + * Copyright 2017 NXP * * SPDX-License-Identifier: GPL-2.0+ */ @@ -71,55 +72,44 @@ * DDR memory map */ #ifdef CONFIG_FSL_LSCH3 -#define CONFIG_BS_HDR_ADDR_DEVICE 0x580d00000 -#define CONFIG_BS_ADDR_DEVICE 0x580e00000 -#define CONFIG_BS_HDR_ADDR_RAM 0xa0d00000 -#define CONFIG_BS_ADDR_RAM 0xa0e00000 -#define CONFIG_BS_HDR_SIZE 0x00002000 +#define CONFIG_BS_ADDR_DEVICE 0x580600000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x580640000 #define CONFIG_BS_SIZE 0x00001000 +#define CONFIG_BS_HDR_SIZE 0x00004000 +#define CONFIG_BS_ADDR_RAM 0xa0600000 +#define CONFIG_BS_HDR_ADDR_RAM 0xa0640000 #else #ifdef CONFIG_SD_BOOT /* For SD boot address and size are assigned in terms of sector * offset and no. of sectors respectively. */ -#if defined(CONFIG_ARCH_LS1043A) || defined(CONFIG_ARCH_LS1046A) -#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_ADDR_DEVICE 0x00003000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00003200 #define CONFIG_BS_SIZE 0x00000008 +#define CONFIG_BS_HDR_SIZE 0x00000010 #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 -#elif defined(CONFIG_QSPI_BOOT) -#ifdef CONFIG_ARCH_LS1046A -#define CONFIG_BS_HDR_ADDR_DEVICE 0x40780000 -#define CONFIG_BS_ADDR_DEVICE 0x40800000 -#elif defined(CONFIG_ARCH_LS1012A) -#define CONFIG_BS_HDR_ADDR_DEVICE 0x400c0000 -#define CONFIG_BS_ADDR_DEVICE 0x40060000 -#else -#error "Platform not supported" -#endif +#define CONFIG_BS_ADDR_DEVICE 0x00600000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x00640000 +#define CONFIG_BS_SIZE 0x00001000 #define CONFIG_BS_HDR_SIZE 0x00002000 +#elif defined(CONFIG_QSPI_BOOT) +#define CONFIG_BS_ADDR_DEVICE 0x40600000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x40640000 #define CONFIG_BS_SIZE 0x00001000 -#else /* Default NOR Boot */ -#define CONFIG_BS_HDR_ADDR_DEVICE 0x600a0000 -#define CONFIG_BS_ADDR_DEVICE 0x60060000 #define CONFIG_BS_HDR_SIZE 0x00002000 +#else /* Default NOR Boot */ +#define CONFIG_BS_ADDR_DEVICE 0x60600000 +#define CONFIG_BS_HDR_ADDR_DEVICE 0x60640000 #define CONFIG_BS_SIZE 0x00001000 +#define CONFIG_BS_HDR_SIZE 0x00002000 #endif -#define CONFIG_BS_HDR_ADDR_RAM 0x81000000 -#define CONFIG_BS_ADDR_RAM 0x81020000 +#define CONFIG_BS_ADDR_RAM 0x81000000 +#define CONFIG_BS_HDR_ADDR_RAM 0x81020000 #endif #ifdef CONFIG_BOOTSCRIPT_COPY_RAM -#define CONFIG_BOOTSCRIPT_HDR_ADDR CONFIG_BS_HDR_ADDR_RAM #define CONFIG_BOOTSCRIPT_ADDR CONFIG_BS_ADDR_RAM +#define CONFIG_BOOTSCRIPT_HDR_ADDR CONFIG_BS_HDR_ADDR_RAM #else #define CONFIG_BOOTSCRIPT_HDR_ADDR CONFIG_BS_HDR_ADDR_DEVICE /* BOOTSCRIPT_ADDR is not required */