From 302b41d5397e9f821d360a74335e8821d4513970 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Tue, 1 Apr 2025 16:55:23 -0600
Subject: 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 <trini@konsulko.com>
---
 scripts/Kbuild.include | 10 ++++------
 scripts/Makefile.xpl   | 10 ++++------
 2 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'scripts')

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)
-- 
cgit v1.2.3