diff options
| author | Tom Rini <[email protected]> | 2025-04-01 16:55:23 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-04-11 12:16:44 -0600 |
| commit | 302b41d5397e9f821d360a74335e8821d4513970 (patch) | |
| tree | 19049ec9e7f728d7de31fea0fbb39ea47836034f /scripts | |
| parent | 3703298e57c8d749b3c06798f5873562754fb84c (diff) | |
Kbuild: Always use $(PHASE_)
It is confusing to have both "$(PHASE_)" and "$(XPL_)" be used in our
Makefiles as part of the macros to determine when to do something in our
Makefiles based on what phase of the build we are in. For consistency,
bring this down to a single macro and use "$(PHASE_)" only.
Signed-off-by: Tom Rini <[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) |