From patchwork Sat Jan 6 03:34:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 856097 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 3zCqCx3Mcjz9s7c for ; Sat, 6 Jan 2018 03:01:33 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id F189EC21E16; Fri, 5 Jan 2018 16:01:01 +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_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 D06EBC21EB4; Fri, 5 Jan 2018 16:00:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 17C9EC21E4B; Fri, 5 Jan 2018 16:00:29 +0000 (UTC) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0042.outbound.protection.outlook.com [104.47.34.42]) by lists.denx.de (Postfix) with ESMTPS id 1EAD9C21E99 for ; Fri, 5 Jan 2018 16:00:27 +0000 (UTC) Received: from CY4PR03CA0098.namprd03.prod.outlook.com (10.171.242.167) by CY1PR03MB2362.namprd03.prod.outlook.com (10.166.207.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.8; Fri, 5 Jan 2018 16:00:24 +0000 Received: from BN1AFFO11FD006.protection.gbl (2a01:111:f400:7c10::129) by CY4PR03CA0098.outlook.office365.com (2603:10b6:910:4d::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.386.5 via Frontend Transport; Fri, 5 Jan 2018 16:00:24 +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 BN1AFFO11FD006.mail.protection.outlook.com (10.58.52.66) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Fri, 5 Jan 2018 15:59:54 +0000 Received: from b49020-OptiPlex-790.ap.freescale.net (b49020-OptiPlex-790.ap.freescale.net [10.232.132.83]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w05G02xu022633; Fri, 5 Jan 2018 09:00:18 -0700 From: Sumit Garg To: Date: Sat, 6 Jan 2018 09:04:24 +0530 Message-ID: <1515209665-615-2-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1515209665-615-1-git-send-email-sumit.garg@nxp.com> References: <1515209665-615-1-git-send-email-sumit.garg@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131596415968716741; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(396003)(39860400002)(376002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(189003)(199004)(5660300001)(2950100002)(16586007)(316002)(85426001)(6666003)(356003)(47776003)(305945005)(498600001)(8656006)(104016004)(2906002)(54906003)(77096006)(36756003)(2351001)(97736004)(50226002)(4326008)(51416003)(50466002)(48376002)(76176011)(6916009)(68736007)(8676002)(81166006)(105606002)(59450400001)(86362001)(81156014)(106466001)(53936002)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2362; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD006; 1:lyQjBogFVX3/XXPQP/uDWsnfu+C9K/KlIWPxcahKFMjnbKpuxo+l+lCqcCpPIAooYT4wOCjFvcXIKXndUTYhWoPCBcFoX8IRewTMHLcgRosDWKdOcB28T133QWBrUStu MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: c1b75c86-c42e-4dde-a7c5-08d554555dfe X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4628075)(201703131517081)(5600026)(4604075)(2017052603307); SRVR:CY1PR03MB2362; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 3:v7k+Q9wCPvEqcHc2JzeBWlnz0oSRP8dKzdVkm8QJ2OmM9ypIL0SUXpi5+Lsvh5xGf3Wv4VCguQATy+SVBHL+9fKS3+K8Y9cULlzsqkdMe/tKek7glhFTS1z6nMV0zzdIdcPEvxVbpWv0nboZvF7e42SiVT2Msg2Az3Z/psxYOs90/gRvTU2GZMQohA3RrVYJM4MTQhTIsPg7eAcXJVdhjdEh22427VP7Bz0Ox2w2GxxcXLJunuOaj7e2cLPpet75eDJC+dihgaa+PqI+5nVa9fhzTvKPsf5rk16BY3T1PhgQUjNofe496yJVBIKB1EQCTkxQ4rcWelY5z1thWrVKBKkbfis1l0VJD0OgVG/jHGI=; 25:zn9DS+JXnpKRpWo3VyA7vYeHkkuKdyawmBhvFcAB6aZPxDQkwr6HHKfzSqV6CGwOa4SCtPW1Jmtt7zz9GO0uem8lsLLw3R0YwOFITncohEE85BeLsQw7TTiQY+MD9PNLe4Ra2X0DGXzeiRhIuzP1WIEN6h+IcwlLRwOwHfGVhWRleU6L6W2lz0CtepP74lZKb3ICbpPczGA3VGTQZzu70tfEo68wunqVd2j7RwfujVOkSudiCew91mydh7zngbFNCa726nqpeWBCznB70gXkUHcQ78nErSNL6f780bZYHk4/rEwLjE4XHQplxAmg1QV4gcW+TKV7oCCalcPnJVue4w== X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY1PR03MB2362: X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 31:l4qrEnmYQ4iy2grfq/wrKk7VwDFUwbyBa6j938qwiMbsLLa/WhKeaVbl7HkpfSTclBUsRp2i1Ow1RBLhcrdMSCEKXkBjmpc8mxjunjShRtC6rK3yH1YpTZR7ruef2xpCf8k1+PXCY6Nnnb2LKR2YAAcWvY5TsDNmpy9lcpIoSqxN/yzI2wNzErjPC2rZxME5ZnM6/p6L0NuL2OR36KZRZ6rEttQ30hgWqL2/rngE8Jg=; 4:q5BWX5FKnDOftz/Su6N6Be/EZ4CPdTGEpiAZuZxWJOa7iDqRv6Tm5BrNOFCBPLjnsJZziU+x4Qo9mCv6LPAdt8FbwH7ggd7+R3/ar6dK7sanbheTi0lsrHrM757gPVedMAhTDqLwe9IfaEIHw7sYgn50FDP9651Kvjx+vj9eHebE9snePyfPhMJYlnQZOYNV8JD79O5uHvhE/PMpPSZwzou4VMa56M0irEGLEQ6TNLr5TjasEK/HnGx+kVyz5qNzYgOIUXlR6B8pGJeIIpYx4yV7ruu7l6gFDrcRdMVTk+DYgF7+FkkpOMzgHYU5BPoO X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(3231023)(944510075)(944921075)(946801075)(946901075)(6055026)(6096035)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123565025)(20161123561025)(20161123563025)(20161123559100)(20161123556025)(201708071742011); SRVR:CY1PR03MB2362; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:CY1PR03MB2362; X-Forefront-PRVS: 05437568AA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2362; 23:uRJWo5KyCQgm3TGbzd0fzJ5VKE6axwZxosW7hh+Kt?= +N/R7g/6t6iQZJuBTP1g2qpxhzkZX1QLUKqhNFxhFhASq1cVYLOqDVeS6w9JTaao0/zff7x2rSnHGYGJ3oyDC+ujh9eFvMLrTfZoVEtjEhDqrO8pvoWQqZZsHu7T3/njv621U3WTPcR4XIY81qvWVK8sfzBY9gsvKm7B8IG70YrNtVygqWTFKaRHcx+y9Z+ZSUPe9gyoZ+Okb3bklerjsK9YQ7ime1IWkNs10l4ZcsNq722ZJ/Fva25vTSmjFC/pmRwrQICxR43czrIkD1HCvmAANX4rhSTkGT8cvSvnfbgkcwMxTlGwKjRMb4Gi4pUZntXTnndwdYPW/wOoPSI/KOSWJwJXZDK8mtemIz879OBY2Y2q7EtZ97npifyRA+XeMl1pR/VHDVDoTBkCy8RJSy6DpVpmx1EPurMWKgHC4uIGAKr/vN4YltJwPvXmiZePU+3aWC7TtTygeqKkaJAJZs511A3ZB3IRKikSYP963InuXDg3xK81XI/pktO5Pc9TQ4/Y1gQVfGlxyMkeaHIISxScaM7Hdw0Y8bc8j440f93q+OaXX/VRwdkKBkqE6ZQGScPQFuTGmRdKYCb+ysIh+eZzZ5pBVhAdcJYxjJH+EU6tgS5kMKmOez2TOWJsNvyrZlSDsd07OMpIrbNst5wiebP5KMwTl+Ise8c94SmBbm6v+dyfauSSikt6c+37hTwSxR/cXmnEmg9+ynoDzZTjaFbVNT1hoOeqeldEuKEe2u+qX4p14aCeeQnSxWkntc3b2qDTXBopKrpxga56lx+gSTR4AWgO1SjsLciebwNKP6SM9jIHaCbeiuxuKiZFSikvnkq/2QGHk7pLYlUVAvxf4QNcW6mxNp5T1l3RXc+GJ2RjWjpvSzoudRuqqqJWCM73YyAzj8zjvrueocA5Eoc1DviRccxyzc/viYmlZ/jnlnIe+lpeOfyY8PBEHVs7J9mtaLF0sVGwxGu35gkdaPkfRpK2iONCmpTa4CgHLAjOVm8G0fn+YVrE/klKyWLJ/41n1XZh6pJKjU6lpIKIwCwjXGkofR1LlXWUp8K8sC91vgSVg== X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 6:ZKmNni0/gk55OOhJJnsYJ7+tfXE6J9yRPBYHXu6fZQN2A7pk7lNUCA6kluicWtBK9iEamXAkfltYuPKJpq28ggseF5ZM1mJaPYy8bbqLnqMOz7NabQGq3+9HBfitj2t6XEtWnchhPoLZnKciHELYQnb6x/n+eH5Nu9GK2x/G2Zdeq3ZLHKnR3+tPLuFC0kCuVvqnCtKjSBvYZpvxePKmdNFyVywuTbu0dnYllM9Z8VBll1gMVzp4AluZu2KvuP9h8Gjm6Nw37s1EOeEttq27nuoI3k2MAQ9XBL21thruymRTH7HB3BJNmYHDj0yw5aCsYsBp4ZDi7hEWjLurzTtSJ4GxcedEA4ELx2UIbmoDnSs=; 5:SfL3a8Jh79tIfMNnPJ4rnxWlvfzexHqHDJAQXAJTv+6w99fSHIWii4zJ0h+DjEDLJlXsCjSoDqDZDGiAo058xtIybFQ4tU5xYfET2/Zjnf2/+sllM17AtMG62JwMRXDl2B0eGZNci0qMFKFHCvy4HwBy0J3raPiTlUf4yyE5KZc=; 24:Ahl2uXRlgTj8Zy0EayCeHqPWfHwg7oz3eaeJJdF8W5UDU79+bA+Ul2iKdsz/oPzdRdOXONosAu6D97H8W/kcd2iJXCBpic2w7cszqJ73R3I=; 7:ltvxntyx4EzkKd1g5MH036hO1v4k48P7lTrYsoCtE//4VAkHYYdBrbQS36amWg9dVVLZw2I5mq0k9JeEBFD+EVsmtG0yUAfuOBRox2Hu754zbzkYvwuz0ZG54bxXHTb65Dd+9+BKLgpa2W6sXfpm36qqscFklKFoCTkL+6ZV43MJHbf2eDHLQknuHy4J4DuAeM4Ff7jQ50FMvR9cVgjPiqeC+ptK+XCBJMXkvurwOHqLaZ70h6/EObXBi9UfQn/S SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jan 2018 15:59:54.5940 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c1b75c86-c42e-4dde-a7c5-08d554555dfe 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: CY1PR03MB2362 Cc: ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH v2 2/3] armv8: ls1088a: SPL size reduction 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" Using changes in this patch we were able to reduce approx 8k size of u-boot-spl.bin image. Following is breif description of changes to reduce SPL size: 1. Changes in board/freescale/ls1088a/Makefile to remove compilation of eth.c and cpld.c in case of SPL build. 2. Changes in board/freescale/ls1088a/ls1088a.c to keep board_early_init_f funcations in case of SPL build. 3. Changes in ls1088a_common.h & ls1088ardb.h to remove driver specific macros due to which static data was being compiled in case of SPL build. Signed-off-by: Sumit Garg --- Changes in v2: Removed code specific to D-Cache off. With GCC 6.2 tool-chain, able to reduce size to 79K. board/freescale/ls1088a/Makefile | 4 +++- board/freescale/ls1088a/ls1088a.c | 16 ++++++++++------ include/configs/ls1088a_common.h | 19 +++++++++++++++++++ include/configs/ls1088ardb.h | 20 ++++++++++++++++++++ 4 files changed, 52 insertions(+), 7 deletions(-) diff --git a/board/freescale/ls1088a/Makefile b/board/freescale/ls1088a/Makefile index bdcce9e..0e15031 100644 --- a/board/freescale/ls1088a/Makefile +++ b/board/freescale/ls1088a/Makefile @@ -5,6 +5,8 @@ # obj-y += ls1088a.o +obj-y += ddr.o +ifndef CONFIG_SPL_BUILD obj-$(CONFIG_TARGET_LS1088ARDB) += eth_ls1088ardb.o obj-$(CONFIG_TARGET_LS1088AQDS) += eth_ls1088aqds.o -obj-y += ddr.o +endif diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 96f183e..d12bcae 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -25,6 +25,13 @@ DECLARE_GLOBAL_DATA_PTR; +int board_early_init_f(void) +{ + fsl_lsch3_early_init_f(); + return 0; +} + +#ifdef CONFIG_FSL_QIXIS unsigned long long get_qixis_addr(void) { unsigned long long addr; @@ -42,7 +49,9 @@ unsigned long long get_qixis_addr(void) return addr; } +#endif +#if !defined(CONFIG_SPL_BUILD) int checkboard(void) { char buf[64]; @@ -342,12 +351,6 @@ int board_init(void) return 0; } -int board_early_init_f(void) -{ - fsl_lsch3_early_init_f(); - return 0; -} - void detail_board_ddr_info(void) { puts("\nDDR "); @@ -451,3 +454,4 @@ int ft_board_setup(void *blob, bd_t *bd) return 0; } #endif +#endif /* defined(CONFIG_SPL_BUILD) */ diff --git a/include/configs/ls1088a_common.h b/include/configs/ls1088a_common.h index 6587296..13b5e8b 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -7,6 +7,19 @@ #ifndef __LS1088_COMMON_H #define __LS1088_COMMON_H +/* SPL build */ +#ifdef CONFIG_SPL_BUILD +#define SPL_NO_BOARDINFO +#define SPL_NO_QIXIS +#define SPL_NO_PCI +#define SPL_NO_ENV +#define SPL_NO_RTC +#define SPL_NO_USB +#define SPL_NO_SATA +#define SPL_NO_QSPI +#define SPL_NO_IFC +#undef CONFIG_DISPLAY_CPUINFO +#endif #define CONFIG_REMAKE_ELF #define CONFIG_FSL_LAYERSCAPE @@ -74,8 +87,10 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +#if !defined(SPL_NO_IFC) || defined(CONFIG_TARGET_LS1088AQDS) /* IFC */ #define CONFIG_FSL_IFC +#endif /* * During booting, IFC is mapped at the region of 0x30000000. @@ -172,6 +187,7 @@ unsigned long long get_qixis_addr(void); /* #define CONFIG_DISPLAY_CPUINFO */ +#ifndef SPL_NO_ENV /* Allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -211,6 +227,7 @@ unsigned long long get_qixis_addr(void); " cp.b $kernel_start $kernel_load" \ " $kernel_size && bootm $kernel_load" #endif +#endif /* Monitor Command Prompt */ #define CONFIG_SYS_CBSIZE 512 /* Console I/O Buffer Size */ @@ -219,7 +236,9 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot args buffer */ #define CONFIG_SYS_LONGHELP +#ifndef SPL_NO_ENV #define CONFIG_CMDLINE_EDITING 1 +#endif #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_MAXARGS 64 /* max command args */ diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h index 1438bec..3c6c666 100644 --- a/include/configs/ls1088ardb.h +++ b/include/configs/ls1088ardb.h @@ -9,7 +9,9 @@ #include "ls1088a_common.h" +#ifndef SPL_NO_BOARDINFO #define CONFIG_DISPLAY_BOARDINFO_LATE +#endif #define CONFIG_MISC_INIT_R @@ -29,7 +31,9 @@ #endif #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) +#ifndef CONFIG_SPL_BUILD #define CONFIG_QIXIS_I2C_ACCESS +#endif #define SYS_NO_FLASH #undef CONFIG_CMD_IMLS #endif @@ -97,7 +101,11 @@ #define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE } #endif #endif + +#ifndef SPL_NO_IFC #define CONFIG_NAND_FSL_IFC +#endif + #define CONFIG_SYS_NAND_MAX_ECCPOS 256 #define CONFIG_SYS_NAND_MAX_OOBFREE 2 @@ -139,7 +147,10 @@ #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) +#ifndef SPL_NO_QIXIS #define CONFIG_FSL_QIXIS +#endif + #define CONFIG_SYS_I2C_FPGA_ADDR 0x66 #define QIXIS_LBMAP_SWITCH 2 #define QIXIS_QMAP_MASK 0xe0 @@ -223,6 +234,8 @@ #define I2C_RETIMER_ADDR 0x18 #define I2C_MUX_CH_DEFAULT 0x8 #define I2C_MUX_CH5 0xD + +#ifndef SPL_NO_RTC /* * RTC configuration */ @@ -230,6 +243,7 @@ #define CONFIG_RTC_PCF8563 1 #define CONFIG_SYS_I2C_RTC_ADDR 0x51 /* Channel 3*/ #define CONFIG_CMD_DATE +#endif /* EEPROM */ #define CONFIG_ID_EEPROM @@ -240,12 +254,14 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 +#ifndef SPL_NO_QSPI /* QSPI device */ #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) #define CONFIG_FSL_QSPI #define FSL_QSPI_FLASH_SIZE (1 << 26) #define FSL_QSPI_FLASH_NUM 2 #endif +#endif #define CONFIG_CMD_MEMINFO #define CONFIG_CMD_MEMTEST @@ -260,6 +276,7 @@ #define CONFIG_FSL_MEMAC +#ifndef SPL_NO_ENV /* Initial environment variables */ #if defined(CONFIG_QSPI_BOOT) #define MC_INIT_CMD \ @@ -408,6 +425,7 @@ #define CONFIG_ETHPRIME "DPMAC1@xgmii" #define CONFIG_PHY_GIGE #endif +#endif /* MMC */ #ifdef CONFIG_MMC @@ -415,6 +433,7 @@ #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif +#ifndef SPL_NO_ENV #undef CONFIG_CMDLINE_EDITING #include @@ -423,6 +442,7 @@ func(SCSI, scsi, 0) \ func(DHCP, dhcp, na) #include +#endif #include