diff options
| author | Tom Rini <[email protected]> | 2025-04-11 12:16:49 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-04-11 12:16:49 -0600 |
| commit | 407d68638fe32418d61681407effba2a303bb9ee (patch) | |
| tree | f15f84f2d50af10f621e804d99557b601050c58f /scripts | |
| parent | c4b273e441327f74449b3035d61ea92a077c1baa (diff) | |
| parent | fa72470a4ec5522fe92986bb53b22167d35d0913 (diff) | |
Merge patch series "Switch to using $(PHASE_) in Makefiles"
Tom Rini <[email protected]> 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/[email protected]
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Kbuild.include | 10 | ||||
| -rw-r--r-- | scripts/Makefile.xpl | 10 |
2 files changed, 8 insertions, 12 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index edc91b24e45..054dd157485 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include @@ -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_ +PHASE_ := endif endif -else -XPL_ := -PHASE_ := endif diff --git a/scripts/Makefile.xpl b/scripts/Makefile.xpl index abc49fbe6c9..43f27874f9f 100644 --- a/scripts/Makefile.xpl +++ b/scripts/Makefile.xpl @@ -58,20 +58,18 @@ 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_ +PHASE_ := endif endif -else -XPL_ := -PHASE_ := endif ifeq ($(obj)$(CONFIG_SUPPORT_SPL),spl) |