am335x_evm: Never set CONFIG_EXTRA_ENV_SETTINGS in SPL
PATCH 1/2 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 <[email protected]>
--- include/configs/am335x_evm.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
include/configs/am335x_evm.h +3 -1
@@ -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 /*
Signature · 1 line
1.7.9.5
PATCH 2/2 am335x_evm: Add am335x_evm_usbspl build target
We add USB (RNDIS gadget) SPL support as a separate target. We need to pull out YMODEM support in order to be a small enough target binary.
Signed-off-by Tom Rini <[email protected]>
--- board/ti/am335x/board.c | 2 +- boards.cfg | 1 + include/configs/am335x_evm.h | 4 +--- 3 files changed, 3 insertions(+), 4 deletions(-)
board/ti/am335x/board.c +1 -1
@@ -73,7 +73,7 @@ static inline int board_is_idk(void)return !strncmp (header.config,"SKU#02" ,6 ); } -static int board_is_gp_evm (void ) +static int __maybe_unused board_is_gp_evm (void ) {return !strncmp ("A33515BB" , header.name,8 ); }
boards.cfg +1 -0
@@ -239,6 +239,7 @@ am335x_evm_uart2 arm armv7 am335x ti am335x_evm_uart3 arm armv7 am335x ti am33xx am335x_evm:SERIAL4,CONS_INDEX=4 am335x_evm_uart4 arm armv7 am335x ti am33xx am335x_evm:SERIAL5,CONS_INDEX=5 am335x_evm_uart5 arm armv7 am335x ti am33xx am335x_evm:SERIAL6,CONS_INDEX=6 +am335x_evm_usbspl arm armv7 am335x ti am33xx am335x_evm:SERIAL1,CONS_INDEX=1,SPL_USBETH_SUPPORT pcm051 arm armv7 pcm051 phytec am33xx pcm051 highbank arm armv7 highbank - highbank mx51_efikamx arm armv7 mx51_efikamx genesi mx5 mx51_efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/genesi/mx51_efikamx/imximage_mx.cfg
include/configs/am335x_evm.h +1 -3
@@ -365,11 +365,9 @@/* disable host part of MUSB in SPL */ #undef CONFIG_MUSB_HOST/* -* Disable UART, CPSW ethernet support and extra environment settings so we -* will fit within 101KiB. +* Disable UART SPL support so we fit within the 101KiB limit. */ #undef CONFIG_SPL_ETH_SUPPORT -#undef CONFIG_SPL_YMODEM_SUPPORT#endif /*
Signature · 1 line
1.7.9.5