From patchwork Tue Aug 29 07:01:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 806983 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 3xhKgv5nL6z9t38 for ; Tue, 29 Aug 2017 17:16:43 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 46E51C21DF0; Tue, 29 Aug 2017 07:08:07 +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=-1.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, 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 23A23C21F2D; Tue, 29 Aug 2017 07:08:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id B6711C21F30; Tue, 29 Aug 2017 07:02:01 +0000 (UTC) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0079.outbound.protection.outlook.com [104.47.36.79]) by lists.denx.de (Postfix) with ESMTPS id B21E1C21D19 for ; Tue, 29 Aug 2017 07:02:00 +0000 (UTC) Received: from BN3PR03CA0067.namprd03.prod.outlook.com (10.167.1.155) by CY1PR03MB2268.namprd03.prod.outlook.com (10.166.207.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9; Tue, 29 Aug 2017 07:01:58 +0000 Received: from BN1BFFO11FD033.protection.gbl (2a01:111:f400:7c10::1:137) by BN3PR03CA0067.outlook.office365.com (2a01:111:e400:7a4d::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.13.10 via Frontend Transport; Tue, 29 Aug 2017 07:01:58 +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 BN1BFFO11FD033.mail.protection.outlook.com (10.58.144.96) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1341.15 via Frontend Transport; Tue, 29 Aug 2017 07:01:58 +0000 Received: from vinitha-OptiPlex-790.ap.freescale.net (vinitha-OptiPlex-790.ap.freescale.net [10.232.134.143]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v7T71mMx006227; Tue, 29 Aug 2017 00:01:55 -0700 From: Sumit Garg To: Date: Tue, 29 Aug 2017 12:31:46 +0530 Message-ID: <1503990107-28658-2-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1503990107-28658-1-git-send-email-sumit.garg@nxp.com> References: <1503990107-28658-1-git-send-email-sumit.garg@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131484637188108197; (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)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(6666003)(85426001)(77096006)(104016004)(50226002)(8676002)(33646002)(81156014)(81166006)(2351001)(5660300001)(8936002)(8656003)(189998001)(106466001)(86362001)(97736004)(50466002)(105606002)(48376002)(47776003)(6916009)(2950100002)(110136004)(2906002)(68736007)(54906002)(5003940100001)(53936002)(305945005)(4326008)(356003)(626005)(50986999)(76176999)(36756003)(498600001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2268; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD033; 1:7RBedsg4t6OlfeXv80KCr7TqJtO4249aHkvWPAzxkX8q5ilGjQiMmssGcyxTRv4labvEbz7H0K/YA88uBN4ASEGQbad+iJuxYEN+ELcKlH++iy9jgQ+Dg17ICULbUWA7 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 73a575ea-0407-4e60-4e44-08d4eeabd779 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY1PR03MB2268; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2268; 3:kzMO5VvJ0+2Dfug6YCDhAYjNDOOJHqqRT1Tcatt6g89ytZn7Uv0wVOUaiZcXFLHyRHLlS+bDm2Trjr50G3iso8z+UoFH/68cSM9BuEJAbUdYKWxpXUrn8PagilW+Ta54HIBNu9R2l3ibh62kiDOjRTj7wRvEVMnFaYzt+g+iS1FPu7jaJs4JxUigBx+XQzYxhN56pLVz+2otitcicQ6Pg4Wfc4gHtLuSjFDLGNkp1bEm3Rcz8wvEJTNkZigXTDfR1/LlxFMeIzRx0wm5doA4LwAWqhycpLXxdPg0mwwKC5JId4RnK8kpnyQWFFSLJ0QB5jSwm9GoubKDocTfYcSJRnPB2C61GtX8aCGTd+6P/Lw=; 25:IBkCso+XOc7WFN2gkSrMVsZG5nImzDSOKg+LJNtm3NOTdGWpw8nIB1sP4Klk5cyKSx5F7lPKAOIrKmHxBNueht5r0my+RkNJniYXdSpbBqsv8ouCxawEpdOd9K1zSrAuqWNyjII1Kw/EWiXHOYU53x0YPjWRGieznjpdg41mWB7dw9MjsCy3fWL2WCEQl6gagOvtg4CV67HxizVmXgPfi7M0imfRgrstMRcizdoIW/yFz31aTJxOsunzLlGVhHMoSsFzYI5+TEedMyddrIgjnb7EAvMJUSkrsNgM3QjoxJtzYNsBiArdSGlut/5JCI+1s9FcfGg4tjke50MsR7ydmA== X-MS-TrafficTypeDiagnostic: CY1PR03MB2268: X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2268; 31:vR8pInva8RuypDysrS37/PTynoMBkJ1rQv9tqurVjLWjqibHGCRaLAOZw9FMf/jwS0n3jDYn+Iz+nfMWrjk2CcgJ0HFMDHW7MZf82mEiYqvtLfWFobpjdXcZntXdZ3jK+QcFjJY6ny15j+Wiw9N3s5QobGkmDnTWoevjb+LsGrFPSXHH0viZsBE80DBmvspSceLXu4vCzoxVhfj40jtXgYpAKdfQ/SRy4wnIXISyEps=; 4:eLPNUrNQdJPt1UuM3Ehd/w6gdQJP9tap82g52LAnSYqqB/CG6nuJTA49/HorKfvFgvWEq7NHtEzKnNasG6g92pHkQ14t5SMhLS3x1/cakpD77ztLuoRj3RcuRc4hewipg5oqB+4xZwv1iT6TRdhU51e6AGqgrVux3YwS4DqNyHrkfmiwju3LS6izS+hq9ruh0BFLbkvr85DqRtSl3JWScrIKqZZnHJl+1ArhpCUKx4jT9aEq5iyjcd0CsY2EoOMDOoN6uLTerUqxjT7EuTXPKAbvjRzBGjxShxQiBQ4rtRQ= 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)(13016025)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(20161123565025)(20161123556025)(20161123559100)(20161123561025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY1PR03MB2268; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY1PR03MB2268; X-Forefront-PRVS: 0414DF926F X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2268; 23:jemaZZwubqMOa5wfvn/3lRatrl530pXg+Ay1QcCcO?= u3AvlFd7ed94tayYYw+t0krhYtATFIEewnGhhWRYV5y8NHVLLCwS9E8xsjIovfKu9jm8PylLomTnoO1aUc7UGamtZVb2OM4+29wcVWWV+kTW0eW8ofkzZtsxCDKPpHuIqj6QPioLdNYzQ2nx2sMFUJK73HWElOLJAWOawAa6bgo4LUb5I67yUDb3Qt3iOVogmg9FmiLmd60KScF2DIjhFVG/hdgODsKihuPDxnMZxseMUCy4AZPmhoutuciXpbenj7vSRcA9cZ2UqmFTbYxVALy1p9DX+AqNWiePblUjdmBYk/yNJ9pBTEM8A43HCaODe235xlCju5gJyTFHqTNk+DZNiQaRLpGU7RHn1LP+TxAjLegtSFVQxZp3hA4HAUupJxZ+wNuw8WZvSx4oQO7Oabx/Dux2bV16DOg+/bwLnxaFcCLInrtVjiBYr0wuVItLAEEZbDBQpciF4tjbrTu0RaC+NHM3QlIwxnm5f7rFAKxRwp4zFBdZKiS+d969PQj/EyDJy8SdH5v82qODDA81gFA880VWS2cEV8s/QRUsZIFsF0ctRXWh34hMcsET+ijXVOs2yDr0SLg8cr3QQuKGuqLuVZ7UUn5SQYSDiKlkKxgYfK4KjRyLwXaD51qzybMwiMtzQsDSwnFQGZsv4KWm60vBnTSYYz3WEQGbZG1PK41CNR1hAiHLLFsh8/mGPkEcSBaZsiI+ueNcrvHARcauNKUagmgjiUROyLZnkc3GZ/nHU+May/98vHR4yVsq+aZPT7VRfOHjJ9guvzeQ89j37B1w8TQkB5LOEh0Ux89/Wl4YvyrKi2s3KpXtV/8MjUOEQUomDuYh7i7AaZYKzamsVNUx7BoQX8MWLqPVTizWPHpJvI0pcnpzuynFm4+f733hc7W63oF1tI5lpcaAaNJiomNjtP2VH2PSgk3Y4vOYdYsoSnmqVywjYLsdtTnvrngIZCqGd/GBq2YyFcSs0e9ORu6pkfudI8Jc0twRkzrxgSh9nagtsUneB5VCMqJjvUWU+QZjSzHEPKUucoLj3yBiNtjCY9i4HWh1M6JTFBZ/voJKkZiIc6Y8wHvvAeVGh8rusOdR+PRXXc43mGG26LwaACW X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2268; 6:RGuWcgnUGyH12oSJQfWJyfADw3cN6v2YrWbYebms/drt0IWypIGliu1npnuQkCNiP11kHnU5MiRHSWPCkGbsA/bKklN3AtXaGKpGxVSQ3Jll4Z+J5ZB71yq2sZN18q2Fmno0wSnynD8IPWR0RAZ4hVFH/Vl1KBygKsNfCSPtOzYL90gZ/fJAlrGl/44CN/DXJuHvH426wukjvD21a815fCk60qrcmbC2JZik7/bF9rqoxMzhYZcEc8PLz5ikJ7cgOsWvPnXcmmudo0lKJpftULnAdfVOXyeVMs8xXd6828zFJz7GiHCXar38CySdBQKegx2j0pylxedyKyJjx3dNOQ==; 5:YWDFmSQ6XXKnoWxPW/bGDHaI1y5H8Pmna3LCi3qUlcc7GM7Au5L+iWPj0/blyDGh7uijBGUBUsHJTA0QDv36FSMK4paHlUy1aDyUEqVCpirGUkGwGYUME5cYbBxXNYTkLlQysa4EYwSeELMCxCz7dg==; 24:ItUBWwZY+TDeLduRoOYqJC2UtuiYiTCd+ZnZdbp+QAVlDUghCHxBMcnkIr7aianX9s6Z4FK3r/jmruxrYASJ9e6NxgYyRxVa76uu/5qc4YI=; 7:ex1BLKnkoGKRoM1jAtKw029mfQBNOpSrJ6lm5BfZ9y7YnFttUwpaVqH+t29LIDjIpndOufy+8MRj5GRFfZRFZtZucAbzujF0Ww5zYtZ059ALPIlb8DclOG0ZPqG30+e1peKDFizIPYMikqb46qfO5VsRuaj6VTeTXutduCL6FhTG6rWqt0k8vUHiiF14/rnvOqkbbEYWbK38HStdZ7nPYMNK/Q9ss1of9N2MK1EKYuM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2017 07:01:58.6236 (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: CY1PR03MB2268 Cc: ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH 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. 4. Enable CONFIG_SYS_DCACHE_OFF in case of SPL build as DCACHE is not being enabled in case of SPL image but was compiled in to add redundant code. Signed-off-by: Sumit Garg --- Dependent on ls1088 base SD boot target. Also dependent on ls1088 QPSI secure boot target. board/freescale/ls1088a/Makefile | 4 +++- board/freescale/ls1088a/ls1088a.c | 14 ++++++++------ include/configs/ls1088a_common.h | 20 ++++++++++++++++++++ include/configs/ls1088ardb.h | 20 ++++++++++++++++++++ 4 files changed, 51 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 1860f9c..1c28ab4 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -24,6 +24,13 @@ DECLARE_GLOBAL_DATA_PTR; +int board_early_init_f(void) +{ + fsl_lsch3_early_init_f(); + return 0; +} + +#if !defined(CONFIG_SPL_BUILD) unsigned long long get_qixis_addr(void) { unsigned long long addr; @@ -324,12 +331,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 "); @@ -404,3 +405,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 63b69f8..fb4c852 100644 --- a/include/configs/ls1088a_common.h +++ b/include/configs/ls1088a_common.h @@ -7,6 +7,20 @@ #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 +#define CONFIG_SYS_DCACHE_OFF +#undef CONFIG_DISPLAY_CPUINFO +#endif #define CONFIG_REMAKE_ELF #define CONFIG_FSL_LAYERSCAPE @@ -70,8 +84,10 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } +#ifndef SPL_NO_IFC /* IFC */ #define CONFIG_FSL_IFC +#endif /* * During booting, IFC is mapped at the region of 0x30000000. @@ -154,6 +170,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 @@ -192,6 +209,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 */ @@ -200,7 +218,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 1d2dd4f..913252d 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 #if defined(CONFIG_QSPI_BOOT) #define CONFIG_ENV_IS_IN_SPI_FLASH @@ -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,6 +254,7 @@ #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 @@ -247,6 +262,7 @@ #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 @@ #endif #define CONFIG_FSL_MEMAC +#ifndef SPL_NO_ENV /* Initial environment variables */ #ifdef CONFIG_SECURE_BOOT #undef CONFIG_EXTRA_ENV_SETTINGS @@ -342,6 +359,7 @@ #define CONFIG_ETHPRIME "DPMAC1@xgmii" #define CONFIG_PHY_GIGE #endif +#endif /* MMC */ #ifdef CONFIG_MMC @@ -349,6 +367,7 @@ #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif +#ifndef SPL_NO_ENV #undef CONFIG_CMDLINE_EDITING #include @@ -358,6 +377,7 @@ func(SCSI, scsi, 0) \ func(DHCP, dhcp, na) #include +#endif #include