Patchwork [U-Boot,1/2] am335x_evm: Never set CONFIG_EXTRA_ENV_SETTINGS in SPL

login
register
mail settings
Submitter Tom Rini
Date Feb. 26, 2013, 8:50 p.m.
Message ID <1361911820-10068-1-git-send-email-trini@ti.com>
Download mbox | patch
Permalink /patch/223394/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Tom Rini - Feb. 26, 2013, 8:50 p.m.
Because of our support for network-based SPL, we don't discard all of
the environment related functions.  We however never make use of the
default CONFIG_EXTRA_ENV_SETTINGS items and as this variable grows, it
brings us closer to (or with some toolchains, over) our SPL size limit.
Never set this in the case of SPL.

Signed-off-by: Tom Rini <trini@ti.com>
---
 include/configs/am335x_evm.h |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 0dc2a50..630cd48 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -49,6 +49,7 @@ 
 #define CONFIG_BOOTDELAY		1
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+#ifndef CONFIG_SPL_BUILD
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x80200000\0" \
 	"fdtaddr=0x80F80000\0" \
@@ -133,6 +134,8 @@ 
 		"if test $board_name = A335X_SK; then " \
 			"setenv fdtfile am335x-evmsk.dtb; fi\0" \
 
+#endif
+
 #define CONFIG_BOOTCOMMAND \
 	"mmc dev ${mmcdev}; if mmc rescan; then " \
 		"echo SD/MMC found on device ${mmcdev};" \
@@ -367,7 +370,6 @@ 
  */
 #undef CONFIG_SPL_ETH_SUPPORT
 #undef CONFIG_SPL_YMODEM_SUPPORT
-#undef CONFIG_EXTRA_ENV_SETTINGS
 #endif
 
 /*