From patchwork Thu Mar 2 11:43:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Santan Kumar X-Patchwork-Id: 734571 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 3vYr4Q17tyz9s0g for ; Thu, 2 Mar 2017 22:41:26 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 94749C21C27; Thu, 2 Mar 2017 11:41:21 +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_H2, 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 F360EC21C35; Thu, 2 Mar 2017 11:41:18 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 45851C21C35; Thu, 2 Mar 2017 11:41:17 +0000 (UTC) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0077.outbound.protection.outlook.com [104.47.33.77]) by lists.denx.de (Postfix) with ESMTPS id ADF47C21C27 for ; Thu, 2 Mar 2017 11:41:15 +0000 (UTC) Received: from BN3PR03CA0107.namprd03.prod.outlook.com (10.174.66.25) by DM2PR0301MB0734.namprd03.prod.outlook.com (10.160.97.142) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12; Thu, 2 Mar 2017 11:41:13 +0000 Received: from BN1BFFO11FD031.protection.gbl (2a01:111:f400:7c10::1:152) by BN3PR03CA0107.outlook.office365.com (2603:10b6:400:4::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.933.12 via Frontend Transport; Thu, 2 Mar 2017 11:41:13 +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 BN1BFFO11FD031.mail.protection.outlook.com (10.58.144.94) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.933.11 via Frontend Transport; Thu, 2 Mar 2017 11:41:13 +0000 Received: from santan-OptiPlex-790.ap.freescale.net ([10.232.132.242]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v22Bf9uT001690; Thu, 2 Mar 2017 04:41:10 -0700 From: Santan Kumar To: , Date: Thu, 2 Mar 2017 17:13:50 +0530 Message-ID: <1488455031-27231-1-git-send-email-santan.kumar@nxp.com> X-Mailer: git-send-email 1.9.1 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131329284734640626; (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)(39850400002)(39380400002)(39400400002)(39450400003)(39840400002)(39860400002)(39410400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(189998001)(106466001)(81166006)(5660300001)(53936002)(105606002)(5003940100001)(92566002)(104016004)(85426001)(33646002)(47776003)(8676002)(50466002)(2906002)(626004)(50226002)(50986999)(48376002)(68736007)(356003)(8656002)(77096006)(6636002)(8936002)(575784001)(6666003)(54906002)(4326008)(36756003)(38730400002)(305945005)(86362001); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0734; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD031; 1:UXR+fywmVFgAu+HNwnDcqDHnH4xI4G5bN61y9KhUV4+2CSEwN8Lnba54ttR5x1C9Ock7HbTZgmwyLOJXirHluXAxSj56rxTlBJP5f/HSIfnRl5JUacJkBBkh5u5eHi6ANDpL16PAVHi+tLQLEQpRJ/SAxzyd7efToxu/Z4MuyyxF6r8ocxnQSw2a7SHQ3Ha3HsbLrmlxC4kb5SxTf1sfBUqhblHCMCecnIhv4q3ChZaLOA3N7dWgg1fVgCvOUsNZU+WwQF/zNmK2wwr8+h3hDJAslQAvjCZcZmCg/X3A/0UDZhV9RWAtzzsp3A3y44s17rJEqKw+X1uvssH5KsJLsq+7u0BFLflMTabWU6dXMtZnXhBVkuFxO1IG9JvZ+iIGM2/0IyHgQSpGhNG6Q2gHzt/BUs1N5lQDkr5ANcBDydsmElgqIfVhYr/UcQfazCMLUzAtioRfQgq+inf7W9Pa103HVoC/GGwQ4tb/m99aEz4iy72uJhmYIUiCs2Ds/OmHLXxurSpWhvOfd7aRJK+I/j1ZH+mGxDh9l3eGDSJ6HvnXnyS66gOt19AZmu2BJSBWX6ji1EwM8ZFqf1DmWjCnLnywvp6bC/Kz6df2vb3xsI/4xxMFP7ak68/ingrb9zhdqmEQ09DEn6G6Ca1QZp/42qMpXf9vFrGHe2UD+r7JgdAVTMLNporFtEXg/6lO8vrGP1gwasuXGJWbOIDFj794kA== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: ce6bd21b-53c7-4f6e-7589-08d461610798 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0734; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0734; 3:fzvB7WrDCM3vQrMyBSmDwxVfH/jSTq3D/S+2GhtKOxSHHHaVfuHzEhg+K95q++hnqAtdaL/R7M93/4yIDGm+zkQE/VFwVF/gFk1oFtxB8cm6GjaqUFW0Xl4TlClHht5e65OjU+ZOzyG+TKjMWPSHLAehzJj7GW6l7YeaylUrDSJte5uGqGvNB7alJX9bIXmmasf6cCzj+N6NsH/aPzLWg7lNTmTciYjvKvErc16MI1ch38HGLWMp7d2bjEtTFEU1kiYyoD8qAUMAgzMQXzjQn8dg76jI7W4Tlm+QU+nTw5/no21v/JgnrM/SBvlrLViE53J7Sw1Xt8t8BsG1YbN6TX9MbPrlq/5OLkhiokVFbBxSgq4FWJc5ToaOoUi3/IDL; 25:H6ulDKLHME9DB7/71tm7iZ26u9Ph5+agrVrcvQ7/rrK+FDcEaDi7+t7dmPHKWTDkN4mNKDGgphOXKWdjgEi3AxjmD7B1boeYgwxfxTPDQb0S8R4WZ15fhy+/gW1oOBd8MFlzgM5dbwToI51wpHCELqSCIDyZUSl7UZRkMxX+j6LbQWtq/btN5d84Tl8WfUp6Haq0QvhgoBTuMYaYdvTBT2tyAvUqt9tiqmYMcRFHYxlfPf5JyANSfn5EjD2dsBAhl31MAIFMiUu0Cavn6M+Y0ygLBLYB9AH2XbAKA5+7t94KfisjvwmrfnYbOduEIibUYXre5HbVi3MdEBRqncWGNC6EzSuh+nHMXDeYKRwbywcA9RTca9JD6nITPjbW552uuSMCDlMg5LDL0TJMKJbDGKYYQeQPckoHSuOWw2gcZbEeM0MnF+lvHEtGPQ73McGT3tmLtqdKnujPEOAYng/tAg== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0734; 31:C8IijYCiVBHbP8reGHho43ZBNiD+CufZM+DK3PujdbMsrtVWODUKIsL95oGFKkHd3yJnMl8hFoT6Mx7GWpua639tXmu6gawdS03BV74I3Nby/O86JF41E5BqbaFnFgPnfwU4LfQ+Giaz80VBYN+TFcKdPBbwGQ3NEw615avHg+zX/kRFfRfFfEGqGCMqFyWpZSZ2U330nCNE8+xFbpsI9oA43+pohIzhM+/G1FfbqLYDW9GogBkZ+at0Vmdxs7MkziikRKyU2Pmh1Pb1q6XmBFGnvlaDI+J8CjDb4gQsAqc= 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)(8121501046)(5005006)(13018025)(13017025)(13015025)(13023025)(13024025)(10201501046)(3002001)(6055026)(6096035)(20161123561025)(20161123565025)(20161123563025)(20161123556025)(20161123559025); SRVR:DM2PR0301MB0734; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0734; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0734; 4:BDHnj0mFaeSe8KhaLgctC3mWa2P7yq9cu2DZpoWYddj044mv6lDNkSq+vAIJPbvCm6RBs5WLTP5JnCCUX3m9DviJIxNngQqfUZG56DPt0XJEoeGehmrMxmHbUMdgBN9fPYqbrSl4X6oxq/irGRwfVorNzJ7w/OwmJJd6MLkvafix06p+QSIsSKjG6d7sUKXeXng1nhW7LdzueGYDGykvGGDYDqpnRVCOFT9jMfF7ucX3hnssbyQmKzaMDDz5RNfZLL/Y1zy0aWE1LKZZeaMH68bXhZjVh2pFZSoW+rZtbTYM3iKokbb36aNDWBgSNdkdcN0jJDt+G9Mxrfh8kiWvxr0Y5g26NrVdBqYTj+B+GjMXNDl/nGcamsH7Z9BgNn51ngfn4B7AI+OAvtkozGtLJJPnLnl/iJHUowinAoAkRtdGb2FRpjdw6DM/0jcu8aaDCXFFHQfMkfYC+dCSR7YjIJ2SPvJR3QBWQ42bKyjQauFlsiGtUAaX9ZLD2nYMrgIEf00B7+wxL7j9VytBj/XFkVvnf1+ih02bY+JQkNqTmvAUVi6Py5vEfbfXYuZnmsXilK+M3OERazo+IN1zJwsoSZKKMk3fTT0VTCUufZ6jCkn/uXZVslmLSUt3eR1dvrG6mPRhqpjaujNHHLeUShaZv0uwFDZIuEpw1G8YPkCAVAZWzRhL6qTcFcSo/T7/GsVTmWWqURziH54lvUtlEwPjNBuxzneDwb3PZGS5QHJUmWGrzgfQrqbunBRam/9dA99S X-Forefront-PRVS: 023495660C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0734; 23:8w0OS1ZjyBPEjqtjguSuM2RxyYHoYJaMZ/ZiCsO?= =?us-ascii?Q?mWzDjWKo+iyQckQCP3d93OEq2YkdldHkyNzyI2G0cPgAoY1Yb4E+UfydP8iS?= =?us-ascii?Q?MusnKdObtdQ/QY28VE791WKTr8BZ4RlvhPld5LxBaPSQ9x6JBv8DkCV3nhQU?= =?us-ascii?Q?n7ZtrxS+HDq0e4Vuh853ij+bVja7x1F/agFrgB8bBdJ4Ag69qoeXUQc8Zp32?= =?us-ascii?Q?ALL0WAbtNfdyhDtbvAI2XbADj49I2+Y283yTV/wybE+yHT04ixduHqsQKC98?= =?us-ascii?Q?ETVNbVch/5bWW3ZncVgYqcG+EjjxA6snaaCvBU7AfPJymxO3DhOn15oic2L+?= =?us-ascii?Q?tdGKKLCyL7RHgwnJYp1V3liCToerdFEkA1sg/k6Z/VImE2Ovf3+kb4t/NJ1u?= =?us-ascii?Q?7S1qxl+nNZ57FFyu9rm1fQ3JmTyzIbkCQxWUDGUmpHd/tqs3AJTt4RJBxpZt?= =?us-ascii?Q?kjL26/DM1SKqOVQy3CHSQXIlWef+4cJwkZpjMtXT4Cvzni4WOMZCUpuZXtBk?= =?us-ascii?Q?X3z5mbI+dbrLlaEu2hjMlMiay0b7RYa40E2JV00yonkPkv816BbJZquc3gdT?= =?us-ascii?Q?VEozHDD/eqDgF3TtoO8cxGC2qopi4yd9im/zsQirjkVawEfgWmkpr/EonNWS?= =?us-ascii?Q?BrMlPApyPboNC/5h3qX9n00klsYVZb6pMefY+jIfiZBFQwbqMBvVQRokSsZZ?= =?us-ascii?Q?0lLp1s1Fx/33Ip7vjmp4TElq79PqgnspSLnr9Y4xpQlxYpSePDQAjQA46aFs?= =?us-ascii?Q?0ieuIelx7xrba2W6gv3wZZDafh/4NJJR1Z1h6MYnnZirUhNulCOsdRVB8Mkd?= =?us-ascii?Q?o2LCTf7u0sxL9iXb/p2F3z91Xvb0ZUp3uECv37Fzajhm5yDyV28G/w8KMDro?= =?us-ascii?Q?zPt/ZnaM+LvIHL8ME6/0BD2Ox3zKylFiewimQD2QdkE1cnHYb18ZzNv8UrdA?= =?us-ascii?Q?qw50a58U9wyeB6+bLJiv5nPsLm28llF+td/QQJnYW6tVCEBJiEQo3VLmMglM?= =?us-ascii?Q?lty04hI9WMq89zG+IQh+7VrgFQAQurwmbvAK4kM15LPRQWP3QE00IJ6A5eaX?= =?us-ascii?Q?KDOlB9lV1VZNoEH/89cuEp86ols3MaKuj848Nah15MTynIvtWJYGQFNyjepl?= =?us-ascii?Q?559RzRQOY4LeSeGlzHg7DFr5vAOIvfxAre40wpSF102L2UweGhyjSQpw91jM?= =?us-ascii?Q?nWT7Qg00umJWGNa9AnMTjT3gkNx1PTU48wMy7OBYAL7xBUUcK1M/d/7wD5g?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0734; 6:31ox4rS8UVICeIlpXHMb+UAGEtWYOnpul0Z9ST8adHWCUBd0LwCLAERv/JDYZ4hW8XLPxT/1xfiuVpco/tLtsfeGlJ2EegmB0S0d0CBFEzrAlHVQxTZDMnSnUGTVhed5ZlL0tMSs2lenMU16kq46e4XPwh2W6XiENYBs/tdcrhdCudMOKDFp9yqMZ+3x4Fd9P1gpa/Djz/dmBDd3xM2sMiEYcI/oKbugkI7CPuKIAjc5rBerfVwMEHSVNpwr8Jl7ZN5Dkl22Fqz7aDmfv51SqPj+dc7shXURimNm4EuEfnkVffgSp0Nl3DScmTrjkeymVrSTXhL/c+2B45tcFHb3zZ0sGUx4cSe2CWkLHBF4T4phSNijtN2cfvCxdMZA7bcHYVtsvHdZMAXoeRvt8XYdBa03qyRkofJAlpLXIpzU4Xg=; 5:sr4UUYxGSMzoVUuzjAeu1Y3DWG6B6mUO3PCQnqp254dBX+lkU6KrJsk1aZqx7ZqwO2v6Jz9NSLz8GARn++WxKRrh73MZCXLaUP1zr7L7pwGwpA6O2rikWDTKUCil4Lsb2Yj+HWoMDvmhoOeOBOCaKwOcd2P1NW88l4SyKczJPYnpaK3cMqvYmuuoObJ+6QQy; 24:Zib6izgYkUR7VNPNXo2dsAYfu60yM1up0A2rIBGonXmP+F2BOEzCh4tN1rdI80wcPmS/UgRG2Q2zZR8C+N3U4UQTY6a2Uk+bR1MLb7MI12M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0734; 7:VrsYtQUXfzvWo3G6mBLAvz0hcwVdsCxIWCymm3S2AF0Nes6AuCYwTcnSUXQg7KQIWdW4Y1rREJFHrs85I6g3rH4b2DuZ93a9hyqJNfE6XEgI4p2MiS1HA/Y3p7WzqXCLIt0LN6aLoFRlnA268TF8zc57HgIzwOjsNlq+HiqZsJPrLhMrz/ZGzvGVcDNNny337NogBdF6Jffu3Uqq5QRvmsTGupQTpjzvSi1DPu7fzVdM66pXU8iMA9IX9Gfx+5zCdaMBeChunj/14AqNKAkQT7+O5OB6u1DGde2iwF9unCB9Jd+GTvziUO72B/XtWrhSA3YOEj+JcDNodIuqCiv5MQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2017 11:41:13.1364 (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: DM2PR0301MB0734 Cc: Priyanka Jain Subject: [U-Boot] [PATCH 1/2][v3] 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 v3: Rebased to latest codebase Incorporated York's comments to defined CONFIG_NAND_BOOT in new line arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + include/configs/ls2080a_common.h | 5 +++++ include/configs/ls2080aqds.h | 4 +++- 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 9489f85..fa68baf 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 8910938..bc0b9b1 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -12,6 +12,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 8223111..d449190 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -12,6 +12,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 4173d9a..ae72939 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -216,6 +216,7 @@ unsigned long long get_qixis_addr(void); #define CONFIG_PANIC_HANG /* do not reset board on panic */ +#ifdef CONFIG_SPL #define CONFIG_SPL_BSS_START_ADDR 0x80100000 #define CONFIG_SPL_BSS_MAX_SIZE 0x00100000 #define CONFIG_SPL_FRAMEWORK @@ -225,11 +226,15 @@ 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_SPL_NAND_SUPPORT #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) +#endif #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 08d1586..93f6b51 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