diff mbox

[U-Boot,v2,07/12] spl: Make CONFIG_SPL_ENV_SUPPORT have to be set by all users of env in SPL

Message ID 1386612538-11186-8-git-send-email-trini@ti.com
State Deferred
Delegated to: Tom Rini
Headers show

Commit Message

Tom Rini Dec. 9, 2013, 6:08 p.m. UTC 
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                   |    7 ++++---
 include/configs/ti_armv7_common.h |    1 +
 2 files changed, 5 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/common/Makefile b/common/Makefile
index 74404be..5ddddfb 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -197,14 +197,15 @@  obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o
 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o
 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
-ifneq ($(CONFIG_SPL_NET_SUPPORT),y)
+ifeq ($(CONFIG_SPL_ENV_SUPPORT),y)
+obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o
+obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
+obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
 obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
 obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
 obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
-else
-obj-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 c3ca5a5..8ee34b2 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -203,6 +203,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		0x80F80000
 
 /* FAT */