From: Tom Rini Date: Tue, 26 Feb 2013 18:08:53 +0000 (-0500) Subject: am335x_evm: Never set CONFIG_EXTRA_ENV_SETTINGS in SPL X-Git-Tag: v2013.04-rc2~24^2~55 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a32f42f65d30fc2ac15fb14e00779db5bc780153;p=oweals%2Fu-boot.git am335x_evm: Never set CONFIG_EXTRA_ENV_SETTINGS in SPL 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 --- diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 0dc2a50408..630cd4841d 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 /*