From patchwork Thu Nov 24 06:36:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Priyanka Jain X-Patchwork-Id: 698628 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 3tPV3z0pKZz9s2G for ; Thu, 24 Nov 2016 17:41:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 383CEA7549; Thu, 24 Nov 2016 07:41:45 +0100 (CET) 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 LdrIvgyF-J2H; Thu, 24 Nov 2016 07:41:44 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 711B14B6B3; Thu, 24 Nov 2016 07:41:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6620E4B6B3 for ; Thu, 24 Nov 2016 07:41:40 +0100 (CET) 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 NF73k4FHM1oz for ; Thu, 24 Nov 2016 07:41:40 +0100 (CET) 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 NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0048.outbound.protection.outlook.com [104.47.37.48]) by theia.denx.de (Postfix) with ESMTPS id B01D64B660 for ; Thu, 24 Nov 2016 07:41:35 +0100 (CET) Received: from BN3PR0301CA0024.namprd03.prod.outlook.com (10.160.180.162) by DM2PR0301MB0749.namprd03.prod.outlook.com (10.160.97.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.734.8; Thu, 24 Nov 2016 06:41:33 +0000 Received: from BL2FFO11FD017.protection.gbl (2a01:111:f400:7c09::136) by BN3PR0301CA0024.outlook.office365.com (2a01:111:e400:4000::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.734.8 via Frontend Transport; Thu, 24 Nov 2016 06:41:32 +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; 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 BL2FFO11FD017.mail.protection.outlook.com (10.173.161.35) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.734.4 via Frontend Transport; Thu, 24 Nov 2016 06:41:32 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:565; Count:8 Received: from b32167-VirtualBox.ap.freescale.net ([10.232.133.91]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uAO6fSdY006275; Wed, 23 Nov 2016 23:41:29 -0700 From: Priyanka Jain To: , Date: Thu, 24 Nov 2016 12:06:21 +0530 Message-ID: <1479969382-15043-1-git-send-email-priyanka.jain@nxp.com> X-Mailer: git-send-email 1.7.4.1 X-IncomingHeaderCount: 8 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131244432924971456; (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)(1109001)(1110001)(339900001)(336004)(199003)(189002)(68736007)(7846002)(86362001)(5660300001)(104016004)(92566002)(305945005)(626004)(356003)(8666005)(5003940100001)(48376002)(97736004)(39390400001)(39400400001)(39380400001)(5001770100001)(33646002)(36756003)(50466002)(38730400001)(47776003)(85426001)(69596002)(39410400001)(50226002)(81156014)(105606002)(6636002)(8936002)(4326007)(6666003)(8676002)(106466001)(50986999)(4720700003)(189998001)(77096005)(2906002)(81166006)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR0301MB0749; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD017; 1:hF5aDUCgNYQLEzIvbxGnoP8Dwiwmvd/NQOQrQgzT9XZrLzOn0vpQ8Up3eK/1hR4ST7UhwvE4if+OXJp0rYpOnTfhlcnGpMKKZqGMymZYBhd3aWSoe/K9KhOQPWjJlW3i3aDhp6NkmGDkM20EfL2y/mCIDGnAwlT6jkW8rdu6nV0w6jn4N7VkWWmFmEJDCOdIyKOW99xtHI5lQoJ1qpWyxoiMERrsEXxKY/XwYm+x8dn89ndCWIbRMLmZWihH1XHG2jN5ZknHGl64xcNkHjmmZaH2hw3Po1sV4DFk1IwNAxpSOW03rzrIvLH0DrnsSJYuY2TWFWNs4jzlzLJDc9KKIyOYSrWNedHKf0/BM8DOzeYYs1zzSZzfUnZuqU7knlJgzmxb4urY8qEdj2EfseBiM6F0tiOmkQhGBnScBpqUsoqWSm/srTK2aGwYBpXT6VCCtmlDzPg+PkKOSMT9rzaiubzCoUl3pqBaEPCSMk8LdPy9eVB/+6+HoepGJ0Z+r8tOdF1vcKQuJ4uqgCfMrzSjVRngfyWt4D+9mO3CvBR9HINpkhT7Z89gVL5nXmM1RAgiMabgwcRc/7e33dNDofzssmePVfw98W05RZfKrHYV5/yWu8+EzlW1JhabkJGqhcusu2fkP9YK9FdVFOlWdbvbg+i1joxvOo5ucmx3pSsJUuS9N5DkGg/6xiWDb+I0Lprg4uC/FIAWJ0nvZmxq3JAnZXHG9w61HcqQhy/RrPxziQU= MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 2:H+RdU1QZYaT2ZC6fcZ4CySLKF2loDcAjqhDHqL2HD1knEy6JMshO1iJslDyhpKn6lT4pMWFg3Tc8d8dkcqaSuPlFH8U0B3Jjs142WkwfgX/8smgj7+/aNxhXVpvYb3h4HSKVOzvZA55dW37xL4+u+T9Yk3Yn6OR3KBDBtMwvKtk=; 3:LyGu/hqM/BjfTvD8ySGSA5Aw6LZC+Xxz6fxYHaaTM+kj9QA4ssV3bHbXR4EwIQzvDnRbwl3gd/Bo8JD0SNtfVmXYGLEK6cHh20nVJJEnQPgvuQ6KhjUa5gYl+H8JDd6CKBxi8xpf03mWprFurnzrSb0VSuJcQi6JPiSjCN+W8nMQFkcpJmZ0iHeOljr1KrdI0D4v7Fn9mJsOiC5Xpt0rk5s1j/YIGvi0HUZnV2Ye1/FN5C7W2TQIDbOVQruXv8z2dZe+tuwjvv/htT5bsvFbTA== X-MS-Office365-Filtering-Correlation-Id: 91561ec7-4226-45b8-91c0-08d41434edb4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM2PR0301MB0749; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 25:tTbHAievtdxwJglux8QUJzk1ypRIPy+RK0wba5nUZ/3lYsLbqnUlIti4awzMmFFKQE/g3GIOCT+70gQBRXRIMKbMjZ33thEsjel4TRx6o2e5BN9MiYJemdY6A82s0Zvrzspdm/rKInz35suTwM2rcVEmL7YcWAIWZHbga6hkDATq/4sqp0oG/H/HuqZ9/1v6yLcj5y2XwXdQ935aJw5l7RE6552MnEAg+2dRh2LWgKqueU0AMa6WIXZcvmdUsmSSwMsPVdbsDY9ndwKgbcyTxt0r6CI0pOWPCSdToaHPSMRL7IoiL5GFY+dswMw8rBVhAgTW0VqsZZpCo4yQYdUwEmr83SjGIJA9bRzoDz2hJ+4ziKdnw0wSgvL5jMpEaYaRYhMkp9YTbkjyehXUj6eAjLpYSETWxj/OdipVVahHbP5tGGDgIJtjM46Eai5nae3RkVmlrPgmWxL5Dt4iC1HbT0vzIWtWw63vJkBejIfr0Xi4iT6guPAeimJJKR+wdQXMYysZDGCERzHRcCC0zRIN/g+KSBsrRuIgsKpHkHAGl1zW9MjSNRPigQ1XX0qQnWxMAO+fs7UrOIT0GFzogy58t01TQ8LphLTc/TTUi6zdbGesARuo3yeAO/Eum8ssSnqz3oA002Q8UQbFvyZxPgWzHrHtGmEhoQnrT8SXchL3SK+DhniPttuJIMw1+gWbp2R46zUvTOIDgQa0mxZBslslordjWFr6A7XBLNL2CBnGi+LSSei0NhgMrItMIoS6LZhYqmO3mePPst0d89OGvXjytQ== X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 31:NnMmGy0xoQ0F52EbiD9dioN1dJvSp105giegayCoaKF2COMe+tudukntFtHQOq7ZZzotQfwwkkwIQYgi+0bo4/eJLK8vyKUIriBDmlwcsfUk8Rf4bNJ9Oy5Mm/yWzHO07GaFpi4M8nTB1SJOpRAQQwuvMKXh19YScvOxCdV9Z51fOL/EfRzW1PrFC4/GqnPaiEZnbnv9B2EyKD2zAeEMbjaHS+FtWq7SRdoQnZKtV4/w6OmcVBN+tWvuAvDzq4BC3J90rgfJr07FLyEf7ElyeQ== 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)(5005006)(8121501046)(13024025)(13018025)(13023025)(13017025)(13015025)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123563025)(20161123565025)(20161123559025)(20161123556025); SRVR:DM2PR0301MB0749; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR0301MB0749; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 4:zCrIt9q/QunkD5y1wfV6+22qNXKreTpyngD72S6ZnkdbEU+koJPWLjTPsDzeC/8mIMuwCvWv370eeLJhWnPjcvW3aGEtDl7wpAMTzAbYU/4WZT5p1MT5udCRWDbLBMI5WDjxtJFGIUBH4a6s1NYmoozIRgeL17ISqkWWEBemUzWs/OmxuEizMbvi9pS5zHRTgLYsvkbsG+EWOjP0yFf1pTWYAMUJzoc/QghbkLjcS/UhN7PK2M2fPXXdjnvlWEW3VX2INoWUTBvCO+epLYXXrASkWMt4qihClBdtSYTLUUC/BXWWyc2VMf+odf378RABom42ZHoM13olUMAvguvAxc2wanpxjvBWnw0+vvmNTwWsw0mcd7OOszxUnmTzc+HrA6bkmofztQSvpURP5IiH8D1D4X5iknKS7sHd66xzrbxFsJzrc+4UKTgtdVA7qdx8zOzGqIgEILBGQa70WNIugkClyvCSMX4GO2P7vwsXJsNdKmbtRl8o/X1FaxROSjEqoaHue2exEpMqklpnqGMGB9wkULHqNNjy7KORQqCL7fuH701rpljZAYk3aJTNm83C3TcsrxWnmwCgaPCODuFX1kmzvGiVEBfAO9VPpw1lNai7GBg6husiNKCIJdM7kQORYN3EgQqg9s7Spm/9+tQ8ZHdQRP3Rx6Gvm1a5spLhytH07jJ7po6lq3kg/KLA5HkW7ClOqt64R0E7L/lmmePd6jGiVF/HrPz6mJvwapZC4vjWiZah/qQFkM28FEjYe3Vo X-Forefront-PRVS: 0136C1DDA4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB0749; 23:92ttxUCXZlTvm9YoytbFQSQzdyuu7T/mJvUAJyC?= =?us-ascii?Q?7HxjeChQiRZWjvOQRCfT7Mm+jYCYl4fEJr7f8B8W6vZKMnWnmAL5eMCDZLv0?= =?us-ascii?Q?DLnsbuMsJVq2YNwUVSSIhWve9FdHEvuicjQOjRT6ZwhmyInHFzXi5neH/kDN?= =?us-ascii?Q?EX57ZNpN5sgwtwRQy10I69VmmiXOWSKBGujMhi5NTexv9TOpaUrxv1HWFLVy?= =?us-ascii?Q?YVWSTP/9Gfw1W5xdc9SVP97YrIkVUjdwBCnAqyvzE3efs9v4dQOuZTKUcdQ6?= =?us-ascii?Q?dcw0FiiUnVCQDokGvVB7CohovBvXCnQANE3AI638CNdrNyl79P1bcVLdEPGQ?= =?us-ascii?Q?SgoeUzQ0A7rkHqxM0nDHXkfYSWGflutrVhoVQUWfEOPJiRePUFsM3iphNj0m?= =?us-ascii?Q?i8lzRP/excqVs2DPOvUEMUkqd78KXXy3h9gdKCJeUfb0S082JpT5nj0Cuun2?= =?us-ascii?Q?5iOyoNc+btiONceUv69HasKp4FC+kMNVlU+mMFqO8sv9nSiY13BUrnMLJXLc?= =?us-ascii?Q?03xsHp8YR/VRxRYJz/4GZE5ceL/wAm6hj0O4U5CSQ0iiDpV79038K09bQvtm?= =?us-ascii?Q?gkVXP+IUNOj2J/i3TD3e0JZuTcyq77u0TMghd7bBTmPTuCsu4Q1s8RJ6XATL?= =?us-ascii?Q?R9lR597e5C52ddLMSyLbUPAUOYPibbGgVDE3lPFJA/HFhQny2NNC62XtsqF8?= =?us-ascii?Q?JjednqgyTtNM+QPZ0MGewHGkIuvNET6ZfqcKCaOX9bRQwlgsPebAJS7clcRQ?= =?us-ascii?Q?yCE80BvkpXCMIQDxMsk/BZHtxsZ1oRCyVsuP2SUvhQRyEvAFEi8eLS+1UCD9?= =?us-ascii?Q?j7y0nw7yKnrrJRJfcuEe7QG7cYht6Ky9baw27vRzwsqZiz4uTVs9+44TkJUw?= =?us-ascii?Q?jiJzmp2PW934uJzcIAImDzIJaTfKB5nUps1kdALSJrQNGFpIkeyTdxN6KIBE?= =?us-ascii?Q?DcuVm9YQ3+4EaRLrnJ4vPYPafXfuNU8VjFSgnxJ96zSssc2aboLluH5C5wrh?= =?us-ascii?Q?XvS7CqTH1doralxbIqUwYcOjPkehyeHDP6ipeu65h1NwYp9GK29s7yKuMOJb?= =?us-ascii?Q?YrKGnm7KRgoFNfNFRa8OBwcLEwVCu9Ssm6Xz2ycpjjrtXOXxS0D/91TVMqCx?= =?us-ascii?Q?Gs7fm3CMJVEPFI+YOMtKkx8oaKkpc4oisO+Gaa/PrWSpC//Z7vA6kuSUna47?= =?us-ascii?Q?xv7HYvkf/p75yel0Tag9Jrc3QTIjZvCEnBa1NA3GNX5P6FqxrFskdz+Q13Q?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 6:XQKX03lJf/BdQfWGGs8FOcoR8+jOmJKJnl2hcqldEGIzp7v61eAcq9N6Vtj2J4Ud7Hpnp7VS3jM9yHPAYrFBMUBZD2JRYXH+zipeayEsJVP7oUmuTHwcqJRzeTZkb8T/oHOSSY66O1j0FUn6HU4nVflk5uPWVKNnPTpWS1HdA46rf5SFzSU6o526nF1W6MVZKS5p5z95pICE74wRtcufguix3YxHzKvKlzCUv3pZnCB6To7fkHrlNvcFLv2oqVRvLxmQCTUDs89SHfKyp8jW5HiFDCMewQ+73loXmc7S264/yUWv7YOWyYW2/RLJYUnbi6rgJyzKbf9dTtfkMfW36w==; 5:QL92p/IxO75Bxb7CZUVYmcEqCJKOaxyWf0QYQIqv2cYmKI1F2IYtMMZYdflZBvTU+PLLKoPRfeHe7niPvI00hlws1vbFCjPA9fsSOIJkXjy9w3zPlYcKPenY2PflUnKisTDOXi4UGJ28PHB+em8+FEXERbk3rdt2rZ05QmAHw8iso0A8Sh9JmI3DxUyesc2e; 24:gbLWT+2Oy38zWfHr7RVHCueDYWtiH8mlVFL3DbWGBDa5nyzQA8l5EdVJLAhWCuK4SRs0eEX5Wl9jWIKyCAKHdcM+ua8m8iXrMgNTJq0ZQsA= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB0749; 7:Tn78YyZS0Bls7Nu5E4jkVeQnbjjxDs6jsXm66Gz4cKWZQ5KMnkhCQgk9i942NFz+KHERx7kV8rkJ7NTzrQadUtKCNvuOioCYi4gggSOGHre53kTfoPkzE78Cp/7x2EEMBSJz+RD82YacSoZu0S8sMXExXBbO1ydMj9/IINWqLiVs4VsgujsE3QJDLU2LvlCxKHzo1eAVo/OdzKYKaZIzmPrPfRTypGUAb/YovpNSAvyl+CVAMGniCB7ATMSOEVIXh2+VCsCI/FNpTQNgMDhyXwgF9T7F6kSZves7YTMN6dgWB91OqcPKBAbhU8oyOi5JkxgzaMxXd+nQZYVXiYUyaVeSdQ+kTLZswKybqdi7ZG4= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2016 06:41:32.2631 (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: DM2PR0301MB0749 Cc: Priyanka Jain , Abhimanyu Subject: [U-Boot] [PATCH 1/2] armv8:ls2080a: Reorganise NAND_BOOT code in config flag 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 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: Priyanka Jain Signed-off-by: Abhimanyu --- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- configs/ls2080aqds_nand_defconfig | 2 +- configs/ls2080ardb_nand_defconfig | 2 +- include/configs/ls2080a_common.h | 4 ++++ include/configs/ls2080aqds.h | 4 +++- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index d43361f..73a751d 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 2161815..5e7bea5 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -12,7 +12,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, NAND, LS2080A" +CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, NAND, NAND_BOOT, LS2080A" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index e40152e..d6633c3 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -12,7 +12,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y -CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, NAND, LS2080A" +CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, NAND, NAND_BOOT, LS2080A" CONFIG_BOOTDELAY=10 CONFIG_SPL=y CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 2cae966..3828058 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -250,6 +250,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 @@ -259,11 +260,14 @@ 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) +#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 838568f..a87d13a 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -202,7 +202,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 @@ -238,6 +239,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