Previously, we forced a "no environment" choice on network using SPL. Now we allow all users to set where they want to look for their environment. This means we have to set CONFIG_SPL_ENV_SUPPORT now for ti_armv7_common.h.
Signed-off-by: Tom Rini trini@ti.com --- common/Makefile | 4 +--- include/configs/ti_armv7_common.h | 1 + 2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/common/Makefile b/common/Makefile index 288690b..4568388 100644 --- a/common/Makefile +++ b/common/Makefile @@ -197,17 +197,15 @@ COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o COBJS-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o # environment +ifeq ($(CONFIG_SPL_ENV_SUPPORT),y) COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o COBJS-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o -ifneq ($(CONFIG_SPL_NET_SUPPORT),y) COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o COBJS-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o -else -COBJS-y += env_nowhere.o endif endif # core command diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 32110f6..d15850b 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -202,6 +202,7 @@ #define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img"
#ifdef CONFIG_SPL_OS_BOOT +#define CONFIG_SPL_ENV_SUPPORT /* For 'boot_os' and similar */ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + 0x100)
/* FAT */