From patchwork Mon Apr 3 11:01:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santan Kumar X-Patchwork-Id: 746398 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 3vxTcY6Lqtz9s7r for ; Mon, 3 Apr 2017 20:58:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A99B1C21C90; Mon, 3 Apr 2017 10:58:42 +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, RCVD_IN_MSPIKE_H3, 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 24012C21C58; Mon, 3 Apr 2017 10:58:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EB8D6C21C58; Mon, 3 Apr 2017 10:58:38 +0000 (UTC) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0041.outbound.protection.outlook.com [104.47.34.41]) by lists.denx.de (Postfix) with ESMTPS id 1EAACC21C48 for ; Mon, 3 Apr 2017 10:58:38 +0000 (UTC) Received: from BN3PR0301CA0059.namprd03.prod.outlook.com (10.160.152.155) by BY2PR03MB288.namprd03.prod.outlook.com (10.242.37.27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1005.10; Mon, 3 Apr 2017 10:58:35 +0000 Received: from BN1BFFO11FD028.protection.gbl (2a01:111:f400:7c10::1:103) by BN3PR0301CA0059.outlook.office365.com (2a01:111:e400:401e::27) 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; Mon, 3 Apr 2017 10:58:35 +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=fail action=none header.from=nxp.com; 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 BN1BFFO11FD028.mail.protection.outlook.com (10.58.144.91) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1005.5 via Frontend Transport; Mon, 3 Apr 2017 10:58:34 +0000 Received: from santan-OptiPlex-790.ap.freescale.net ([10.232.132.242]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v33AwVsa021224; Mon, 3 Apr 2017 03:58:32 -0700 From: Santan Kumar To: , Date: Mon, 3 Apr 2017 16:31:18 +0530 Message-ID: <1491217279-3915-1-git-send-email-santan.kumar@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131356907151378046; (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)(336005)(39400400002)(39840400002)(39860400002)(39850400002)(39410400002)(39380400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(9170700003)(48376002)(85426001)(8656002)(50226002)(97736004)(8676002)(189998001)(81166006)(53936002)(54906002)(8936002)(33646002)(77096006)(50466002)(50986999)(4326008)(105606002)(86362001)(6666003)(36756003)(356003)(305945005)(47776003)(2906002)(104016004)(6636002)(106466001)(5003940100001)(5660300001)(38730400002); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR03MB288; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD028; 1:kaL3tmNa3lX/NVSt0KtAZU/dUWuqh1+NGDu1NkJXOnYIs1x1NWiguY0FPu6IW+MQy+bfq2acdBUQQxpdi7iwsWyeK3WiyRruDHLnH76MVe0bDFBZ5OFXfP+6mZ0QH9fyYA+yDDQngco6UyF3AXekwzajyDMUXvTAWPo6AR4YhQxGnNNthYKzAYqFxB21yjSm/2NJtxZX8GAR94BHTj8xkLgn3+dL1d02pLYhYtIzGPQngdMOllQY7jFRU6Kh7jKneSXloFLEptDTL7Qo1bjsC8HYXE+mfsFwd2HJp5ktX4fcFWBQTQG9QaFn9f/wjjfahGs7U0uRSViHfvSFAyFIEAHvorBuTKHXK7B+U5fJRE/nFN4ViCbw4V4/qrgT3Z3C/TA50NlVhzWyhLgDxvTRea3bAwpUg/TtvNq1RFaFgifjZo5CZn1V0jhQrDQKRrFe9WzruLfPp3ktMP4MqOYWdvertgwQK0d1bGAwKgTgUunFM3drgejQCWZzq/xWeQJeErzYvoBfPZi/D3pWH6HXjEJb2YvMYUH+0gj3rZJvM8uOBkA7D9d6noaKAirpyHzDQKKDlYX2d7f4+SpoNM+O8XLlUBhFi7o3ajmGbK3T4npvxSND8MuwVdF8wGHIYY7/CtftVsM3wbjRcPWUcU373MDpJ5Jf9Phb4ivmym+A3ASGGiS2lsiwDXPUMSaHbABWjgU0Q867kE6rRPI7YFNrSbXxSnMrToJaJAZsOEth0Es= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: f7950f25-bc78-4b97-83be-08d47a805fff X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030255075)(201703131430075)(201703131517081); SRVR:BY2PR03MB288; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 3:ZJ5hIVlSKflyVHGhHd6LoBRlwaHpb5WMweTMucuhArVbpWDh0CSjtm6QT8w4x2C5IL769RknpgfmM7gEXfVK3U2S9K6FY2c3D40m/Vg2xz2SIA21k461gN33TyFZtFCHkmd5xya6oTV5aoV+7T79RmZMNR0SUdDB6X+egyMX1vp5jUD/hqfaM8mS+baiZfKmyGTqEKWPWgJcFNzJHR0t1Q+5p3rP5U7Hx4d4jzzJvSH0vSWKD8RA0MNzDXoh9T05/AT+WZAhCFNeuHLfe11vM5sgfDv6WNt54OqhHZsqjXvWPLqNpnf36fQcU8PC3xbzLSZgAQjE4qLrgGrh2l+WoZNZP/RHKirvAGW4Dn5aPWbnfrOMiDLAPmm8aJOg73AtgFnGbZUiw8TyHnGn9Wp31oKlbYffmHxDqX6/vTnmO7oLwgBRnCSinDqtLwa+DnfnlHjmCtp0KGkAyWfAEkxedA==; 25:bd5iTR9dVZeZZMurIe8huuQrNziXs+FE5IJz74KfU6koxXyoGktqqaUfiEek5F2zBIx3sNd3F60L7vXjTk2YE0mU5rruOC1lllLCBBysZr4gRvyJKW0DnrsiTpMHTTLCKk2Jhmh9uKOmkbJNeJ5QCF8G6Cf6OxF4r1tCiFFeR2Go7qbJ8EmQsLtiNLjCV048SNIRXdMndlD7WtOaxIOxr/ZtVY+9XoJRu20ux4Q+pruSAQzoIkGTscgnlThLmpIbVP3X5ghueIoPmp0kqvOv53+YKL70qGNth4GWsrKPoelg1b3laM7PX4UvehNkDdnA9I5Sv9RQoS5GpKRuBZQUG1Iq+xjGqMBadKVz/YOlKHQlXBhAyL+H3Co3Moam3AUZuH1Z0QMYiLGMb0igllxoqKfuXPsZpguj8ovcRpxuzptiW48na3QJUS+ifVM5/cUcuF67tYHliFV5qbvzZISYww== X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 31:08clpI+0QV948YiBmquo+XVQkF+YiYiQlGJTEAaGdN0ZOJRloGmz5G0zd6dJ2UAyz9qVxdVAnZMd8gnhEQR5DFhPAZ2C/n7fH9tRjq8eNiWQ/3Kob/R1nMrBHwEFQqspcERxbhpmPJd5reSiqWkQ/TxJEWRqWnqRStI6GKPVhG2OUff287joeXSSFWanK+vsz2cwUQK5/ja3Z5TN6V6SKr5v374jV/aRvKcnjgv7Pkr21VwsDFQWWnLK71RrD75UZ7Aq+BpzN2pYfrp/nZbX7f8JKZrqzzTVxH03DslGVo0= 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)(5005006)(13017025)(13015025)(13018025)(13024025)(13023025)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(20161123563025)(20161123556025)(201703131430075)(201703131448075)(201703131433075)(201703161259075)(20161123561025)(20161123565025); SRVR:BY2PR03MB288; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR03MB288; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 4:+7/47fHQqF2c1a5TSg5tTlZQybGjtmvo5/i6nTF9G54mMCsqr/M+ymYiHMlavmcV+ABUqDwpCnatwBhOpCW3/i5vJx4iH1qkIKXITa8U4+TYLFwPP1hLY0fi6eQdJP5pTG/zY88TB7fLhmrnYdcXSFrGFU85cgtlknYWFZqhBSH7TwzUCpvl/0HD3WWu54g2LQaeT5xBEb65exJ28/tmMy09g2zzNL1+djOlx+vSEGPklNg40IFE3VAUxuWlErqeEwBjHAGciTKzDss8druklbv4O0PMZFweeicGuFRxmoSQ/PcX1G9to4KxEQ2DoDxaVpgJt3tfGtZw6zfJ1EHTdAXpV0cT45nyQsLN0D/JQ/ksgdrOgVlMJvIZoSFnw2Q87HMMUPeVl+JdjobjVG9l2c9N+nlmiXpkQkXfIIV6FYYJ/DmJDVO6IsglEW+Kk4iBwjrkpPkP8VqgdIm8WoGHQV8x5mRydF26BxFCd+yzMQnwK+6YTe+6iiXohGNEOJDhMCAY3n2ZfooogKKD5OTvN3rBsy42gNz0HOgfjpk6U+Me9lNLzjRa8t2ueCrVLqAVI/qUzXjTykhwIzaQbz5eKdTZJHrxHI42RKSMJbDBlxTRskahTFjTUePXSragCyq/Wjti4eEtqBMfSYDof0P61+7soF0/ScRniLIR1z9aqlC9MFf3/yhiDNETJg1d3IFwmp8kM8txd1lQVi8dw3WdqQHaPNvfHAdorvYpSbmXKPbaptrVy/bt6nx4gJNrsxeOAME0mi0eXNQtCvxmYc907lxf1wlCtJJDbv/GYy2y+rA1/S7MlDLBMxtNK3ugOlKPSmRZCE5E4u9JpwY6vuvqTVWPkNLB4/4UjGGJVPKsd9D86UFtyd6ILQhEZutkoFSg2Rv0RcFcvwt/syfrRCv7ig== X-Forefront-PRVS: 0266491E90 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB288; 23:O915mP2wRVkeuZbuphvDKHcWHJ2MAI7nS5ZBDQaXkz?= =?us-ascii?Q?Xw9SrctEQjtDtGhbeHmjlNB1hnmtLwy+OArbZ8QdFa/ErAXm6tKg1lMzS4R2?= =?us-ascii?Q?kSmMFEyDa9rESMkVX3zaiUVkvhZlXGu/AqFfN5wqjDFewRRb1GxJWJjzBrJB?= =?us-ascii?Q?oOFnoe9rsA63PwjAlXxBcHl3pVN/TK5U7aaA6f7gMmxuGrJsmWyXd969IK9e?= =?us-ascii?Q?hCN5OHFFGg95k9LBllXl8cnO0/HfScfXVNdUFCUCtlDSa0lkH5GcGE7TeGto?= =?us-ascii?Q?VgGURJMIDWZGw1dSCDbaVM+PGAku7kIDi4il6u0B5mribqwG4fGpT2xgTLMV?= =?us-ascii?Q?ZVV/DhgdjzfuUQJY7aQk3IFbvVatrCpJhUMDTQ5+omZOCoPzcyatOCCpB8ZW?= =?us-ascii?Q?eM4tFR2pFqnHcNPz1BD5ou70uMqczPLqS34fUDcY1uUQVQGp8wwPa2wZ14IS?= =?us-ascii?Q?yqAGxz5c7+7tOzzVcNWBViK4+fnAeprHE/2YvtAiOEEln5GgfRAfvgf//vzj?= =?us-ascii?Q?esPYr6EkO0hY5GrgbMj7qgtM2S9tsRxcGzazpj20VRZ/dOd1tnIhO6xfO61U?= =?us-ascii?Q?EGgAbrJtCLzO7yZerOwxxMvxLJQBZauAniHze/HZwmP9xwS6YjSxE/o5DL8t?= =?us-ascii?Q?fux6e/F8kiEAf7IdHENUOptquW7t7NppdFRUke9znXpdxm72KYCnlsYD3J+7?= =?us-ascii?Q?YpJUp/S31l3QkNGgimN90SEPSGx+kpD0qNXqzc9i/hxwSyK0u8Jc0othMOeo?= =?us-ascii?Q?A0rirwcHaUR9HpKenJcDQLsuapX4irarB+ABZwHAWhJyEu6KZ5oFtzsto+GX?= =?us-ascii?Q?HMbr5pEIrm9GNP3B9l9fmzPXBHMP8LHjZ8ZNBJZUdIQ2Zz+aVZbNf9TV5z75?= =?us-ascii?Q?+tv/QSjRkmk46ZEEPlw5ySdnBN8h719H9h/8nP6MRIpF5JtHfjCm8uA8KsVm?= =?us-ascii?Q?biBbX8luzDVp27TdW2nqFwKCQ5aD9h32Q6GvXUjNQof7RFTJGdMkXLcF0aiv?= =?us-ascii?Q?duonu4lFMXIqzCnJ7D9Xo6KFE73Pti6QwZZ5DABP7cQd2gVv+tASaghwLwrt?= =?us-ascii?Q?8QYw2iuaWPG4/afAVq1Al79m8sO6VuFRo4jv+QK9ncrPu9uUWDPE3OarxlH9?= =?us-ascii?Q?VxWoecb5kdCG7h/YY9n21AyCmJZf76?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 6:BUShCEmMSk360yFVOV6athJdYuWpjByA753tsZnbLpTFhdGDMFM7NgdyMfj4h2kWNiggHlYrsbKTsmEf2OIz0j5vT2JtrKA2Kx4ZXA0DW9xZ2JyT8gO1rf8dzYvmtuAMAIxZ346ZzXbGsUcMiPRZp4LWj3PehiJxYSK41qXWPPxYKXikZmWRIrGDk8J6CGC3M2st1ZbXxTqn1HD0CMn6sFL6OR2aUHF5XWD7h6nCC9J7bc/NleXAD6KrWOC4w+mELkLEYGfz+ZjfroYZxw0xiRLnBtPGCBEbvlZLFV+xlBf3p4nYLhhvJ3MLIu8XO0FfCv4njXzocN5a9VWWbM2MGGxkMFBITS8CBTIau8FktDr9/w9GojwTQw9+mpZpHTVHFrZXte/TJeYyLn21BQ6gwA==; 5:ueRIuHyPVrmGTV5kqlJ7u7PcoZxNKFEHcVGylVgm21l7BHKLCKDQs3vrY/Xh4E3oQl8indEhoqUuiX5G1D8ovG8bwId9m0C8ZL0EnUFKQH5LcV5jfhH0DrA6Yb18wyhalvJ22GyI2jn9N2qfR0+jewiCtV8lEZJldw/crq3sV9zlUkF1ta6TULLjLWyEsgbt; 24:t+UwfvVqfawTRKzpX26/DxG8Qp4+DEXaGi6K6rGgiVHvi+ZC6/HlAIZg5j95IV2YNVPCEJh1ozEmgSEgVFGgL1xVGe/AKF0ko+cOTMAO4BY= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB288; 7:/gU6n8cxalmBdSN2KjzAEAmii2+1PSEn+qQk9+v4NCYKw5GCGGD6E/fT1KmmASYWlTnNCq7n8+LwNxg7YBP48rF2JQTfAiYFrGwNN++11TtxRpkyR/RAsYU1lmTFiNS2ZTPpqGHDMHVAwRLNNd83JERyS8mOw0FcGO9Tge26zIBTGitb40IqH5O8n/yYSkdV5WykG3h9FZ5jv1ib6nOyhBmn5iIxRdNZS8u9djXE4B8mEXqAOdMTKezeHKSjPDj/M9YLmv/w8Ve0ToYe9BybWxBLV+ugfk6g/eX9trx/RunUUdTLkklRgdoPqSokaoWWZA6XVY++X9tam2pYQ9hmOg== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Apr 2017 10:58:34.8882 (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: BY2PR03MB288 Cc: Priyanka Jain Subject: [U-Boot] [PATCH 1/2][v4] armv8: ls2080a: Reorganise NAND_BOOT code in config flag 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 CONFIG_NAND_BOOT config flag to organise NAND_BOOT specific code in config flag like -nand-boot specfic errata errata_rcw_src() -CONFIG_SYS_NAND_U_BOOT_DST,etc Signed-off-by: Santan Kumar Signed-off-by: Priyanka Jain Signed-off-by: Abhimanyu Saini --- Changes for v4: Rebased to latest codebase Incorporated York's comments to remove CONFIG_SPL and move CONFIG_SPL_NAND_SUPPORT to kconfig arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + include/configs/ls2080a_common.h | 2 ++ include/configs/ls2080aqds.h | 4 +++- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 9e3cdd7..76e3af0 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -134,7 +134,7 @@ void erratum_a009635(void) static void erratum_rcw_src(void) { -#if defined(CONFIG_SPL) +#if defined(CONFIG_SPL) && defined(CONFIG_NAND_BOOT) u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE; u32 __iomem *dcfg_dcsr = (u32 __iomem *)DCFG_DCSR_BASE; u32 val; diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index 2a649c5..7fe4262 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -10,6 +10,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_NAND_BOOT=y CONFIG_SYS_EXTRA_OPTIONS="NAND, LS2080A" CONFIG_BOOTDELAY=10 CONFIG_SPL=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index 81987fe..7c45541 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -10,6 +10,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_NAND_BOOT=y CONFIG_SYS_EXTRA_OPTIONS="NAND, LS2080A" CONFIG_BOOTDELAY=10 CONFIG_SPL=y diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 427f623..12078c3 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -222,8 +222,10 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_TEXT_BASE 0x1800a000 +#ifdef CONFIG_NAND_BOOT #define CONFIG_SYS_NAND_U_BOOT_DST 0x80400000 #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_NAND_U_BOOT_DST +#endif #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00100000 #define CONFIG_SYS_SPL_MALLOC_START 0x80200000 #define CONFIG_SYS_MONITOR_LEN (640 * 1024) diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index beacb99..4c48562 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -197,7 +197,8 @@ unsigned long get_board_ddr_clk(void); FTIM2_GPCM_TWP(0x3E)) #define CONFIG_SYS_CS3_FTIM3 0x0 -#if defined(CONFIG_SPL) && defined(CONFIG_NAND) +#if defined(CONFIG_SPL) +#if defined(CONFIG_NAND_BOOT) #define CONFIG_SYS_CSPR1_EXT CONFIG_SYS_NOR0_CSPR_EXT #define CONFIG_SYS_CSPR1 CONFIG_SYS_NOR0_CSPR_EARLY #define CONFIG_SYS_CSPR1_FINAL CONFIG_SYS_NOR0_CSPR @@ -233,6 +234,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_PAD_TO 0x20000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 * 1024) #define CONFIG_SYS_NAND_U_BOOT_SIZE (640 * 1024) +#endif #else #define CONFIG_SYS_CSPR0_EXT CONFIG_SYS_NOR0_CSPR_EXT #define CONFIG_SYS_CSPR0 CONFIG_SYS_NOR0_CSPR_EARLY