Make this define mean SPL only, not TPL, VPL, etc.
Signed-off-by: Simon Glass sjg@chromium.org ---
(no changes since v1)
scripts/Makefile.autoconf | 4 ++-- scripts/Makefile.xpl | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index d7544022a31..c1eab2f3a1d 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -87,11 +87,11 @@ spl/u-boot.cfg: include/config.h FORCE
tpl/u-boot.cfg: include/config.h FORCE $(Q)mkdir -p $(dir $@) - $(call cmd,u_boot_cfg,-DCONFIG_XPL_BUILD -DCONFIG_SPL_BUILD -DCONFIG_TPL_BUILD) + $(call cmd,u_boot_cfg,-DCONFIG_XPL_BUILD -DCONFIG_TPL_BUILD)
vpl/u-boot.cfg: include/config.h FORCE $(Q)mkdir -p $(dir $@) - $(call cmd,u_boot_cfg,-DCONFIG_XPL_BUILD -DCONFIG_SPL_BUILD -DCONFIG_VPL_BUILD) + $(call cmd,u_boot_cfg,-DCONFIG_XPL_BUILD -DCONFIG_VPL_BUILD)
include/autoconf.mk: u-boot.cfg $(call cmd,autoconf) diff --git a/scripts/Makefile.xpl b/scripts/Makefile.xpl index 08453f0b415..b43ff998679 100644 --- a/scripts/Makefile.xpl +++ b/scripts/Makefile.xpl @@ -21,9 +21,10 @@ include $(srctree)/scripts/Kbuild.include
-include include/config/auto.conf
-# This file contains 0, 2 or 3 lines +# This file contains 0, or 2 lines # It is empty for U-Boot proper (where $(obj) is empty) -# For any xPL build it contains CONFIG_SPL_BUILD=y and CONFIG_XPL_BUILD=y +# For any xPL build it contains CONFIG_XPL_BUILD=y +# - for SPL builds it also contains CONFIG_SPL_BUILD=y # - for TPL builds it also contains CONFIG_TPL_BUILD=y # - for VPL builds it also contains CONFIG_VPL_BUILD=y -include $(obj)/include/autoconf.mk @@ -31,7 +32,9 @@ include $(srctree)/scripts/Kbuild.include UBOOTINCLUDE := -I$(obj)/include $(UBOOTINCLUDE)
KBUILD_CPPFLAGS += -DCONFIG_XPL_BUILD +ifeq ($(CONFIG_SPL_BUILD),y) KBUILD_CPPFLAGS += -DCONFIG_SPL_BUILD +endif ifeq ($(CONFIG_TPL_BUILD),y) KBUILD_CPPFLAGS += -DCONFIG_TPL_BUILD else