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

Merge patch series "Switch to using $(PHASE_) in Makefiles"

Browse Source 
Tom Rini <trini@konsulko.com> says:

This series switches to always using $(PHASE_) in Makefiles when
building rather than $(PHASE_) or $(XPL_). It also starts on documenting
this part of the build, but as a follow-up we need to rename
doc/develop/spl.rst and expand on explaining things a bit.

Link: https://lore.kernel.org/r/20250401225851.1125678-1-trini@konsulko.com
This commit is contained in:
Tom Rini
2025-04-11 12:16:49 -06:00
parent c4b273e441 fa72470a4e
commit 407d68638f
90 changed files with 309 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/Kbuild.include
View File

@@ -324,18 +324,16 @@ endif
# do not delete intermediate files automatically
.SECONDARY:
ifdef CONFIG_XPL_BUILD
XPL_ := SPL_
ifeq ($(CONFIG_SPL_BUILD),y)
PHASE_ := SPL_
else
ifeq ($(CONFIG_VPL_BUILD),y)
PHASE_ := VPL_
else
ifeq ($(CONFIG_TPL_BUILD),y)
PHASE_ := TPL_
else
PHASE_ := SPL_
endif
endif
else
XPL_ :=
PHASE_ :=
endif
endif
endif

12
scripts/Makefile.xpl
View File

@@ -58,21 +58,19 @@ endif
export SPL_NAME
ifdef CONFIG_XPL_BUILD
XPL_ := SPL_
ifeq ($(CONFIG_SPL_BUILD),y)
PHASE_ := SPL_
else
ifeq ($(CONFIG_VPL_BUILD),y)
PHASE_ := VPL_
else
ifeq ($(CONFIG_TPL_BUILD),y)
PHASE_ := TPL_
else
PHASE_ := SPL_
endif
endif
else
XPL_ :=
PHASE_ :=
endif
endif
endif
ifeq ($(obj)$(CONFIG_SUPPORT_SPL),spl)
$(error You cannot build SPL without enabling CONFIG_SUPPORT_SPL)