Commit a32f42f65d30fc2ac15fb14e00779db5bc780153
1 parent
4cfc611b4a
Exists in
master
and in
53 other branches
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 <trini@ti.com>
Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff
include/configs/am335x_evm.h
| ... | ... | @@ -49,6 +49,7 @@ |
| 49 | 49 | #define CONFIG_BOOTDELAY 1 |
| 50 | 50 | #define CONFIG_ENV_VARS_UBOOT_CONFIG |
| 51 | 51 | #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG |
| 52 | +#ifndef CONFIG_SPL_BUILD | |
| 52 | 53 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
| 53 | 54 | "loadaddr=0x80200000\0" \ |
| 54 | 55 | "fdtaddr=0x80F80000\0" \ |
| ... | ... | @@ -133,6 +134,8 @@ |
| 133 | 134 | "if test $board_name = A335X_SK; then " \ |
| 134 | 135 | "setenv fdtfile am335x-evmsk.dtb; fi\0" \ |
| 135 | 136 | |
| 137 | +#endif | |
| 138 | + | |
| 136 | 139 | #define CONFIG_BOOTCOMMAND \ |
| 137 | 140 | "mmc dev ${mmcdev}; if mmc rescan; then " \ |
| 138 | 141 | "echo SD/MMC found on device ${mmcdev};" \ |
| ... | ... | @@ -367,7 +370,6 @@ |
| 367 | 370 | */ |
| 368 | 371 | #undef CONFIG_SPL_ETH_SUPPORT |
| 369 | 372 | #undef CONFIG_SPL_YMODEM_SUPPORT |
| 370 | -#undef CONFIG_EXTRA_ENV_SETTINGS | |
| 371 | 373 | #endif |
| 372 | 374 | |
| 373 | 375 | /* |