colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xpl: Define CONFIG_SPL_BUILD only for the SPL build

Browse Source 
Make this define mean SPL only, not TPL, VPL, etc.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2024-09-29 19:49:51 -06:00
committed by Tom Rini
parent 1d6132e2a2
commit 9280a948b1
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/Makefile.autoconf
View File

@@ -87,11 +87,11 @@ spl/u-boot.cfg: include/config.h FORCE
tpl/u-boot.cfg: include/config.h FORCE tpl/u-boot.cfg: include/config.h FORCE
$(Q)mkdir -p $(dir $@) $(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 vpl/u-boot.cfg: include/config.h FORCE
$(Q)mkdir -p $(dir $@) $(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 include/autoconf.mk: u-boot.cfg
$(call cmd,autoconf) $(call cmd,autoconf)

7
scripts/Makefile.xpl
View File

@@ -21,9 +21,10 @@ include $(srctree)/scripts/Kbuild.include
-include include/config/auto.conf -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) # 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 TPL builds it also contains CONFIG_TPL_BUILD=y
# - for VPL builds it also contains CONFIG_VPL_BUILD=y # - for VPL builds it also contains CONFIG_VPL_BUILD=y
-include $(obj)/include/autoconf.mk -include $(obj)/include/autoconf.mk
@@ -31,7 +32,9 @@ include $(srctree)/scripts/Kbuild.include
UBOOTINCLUDE := -I$(obj)/include $(UBOOTINCLUDE) UBOOTINCLUDE := -I$(obj)/include $(UBOOTINCLUDE)
KBUILD_CPPFLAGS += -DCONFIG_XPL_BUILD KBUILD_CPPFLAGS += -DCONFIG_XPL_BUILD
ifeq ($(CONFIG_SPL_BUILD),y)
KBUILD_CPPFLAGS += -DCONFIG_SPL_BUILD KBUILD_CPPFLAGS += -DCONFIG_SPL_BUILD
endif
ifeq ($(CONFIG_TPL_BUILD),y) ifeq ($(CONFIG_TPL_BUILD),y)
KBUILD_CPPFLAGS += -DCONFIG_TPL_BUILD KBUILD_CPPFLAGS += -DCONFIG_TPL_BUILD
else else