[PATCH 16/42] powerpc: Simplify check for SPL

[Simon Glass]

Now that SPL means SPL (only) and is not defined for TPL, simplify some
checks for SPL.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 arch/powerpc/cpu/mpc83xx/Makefile | 4 +---
 arch/powerpc/lib/Makefile         | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/cpu/mpc83xx/Makefile b/arch/powerpc/cpu/mpc83xx/Makefile
index 9974239f881..7c4ef7657e5 100644
--- a/arch/powerpc/cpu/mpc83xx/Makefile
+++ b/arch/powerpc/cpu/mpc83xx/Makefile
@@ -7,13 +7,11 @@
 
 MINIMAL=
 
-ifdef CONFIG_XPL_BUILD
-ifndef CONFIG_TPL_BUILD
+ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_INIT_MINIMAL
 MINIMAL=y
 endif
 endif
-endif
 
 extra-y	= start.o
 
diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile
index f797f8cee66..b218ae2b91c 100644
--- a/arch/powerpc/lib/Makefile
+++ b/arch/powerpc/lib/Makefile
@@ -9,13 +9,11 @@ lib-$(CONFIG_USE_PRIVATE_LIBGCC) += _ashldi3.o _ashrdi3.o _lshrdi3.o
 
 MINIMAL=
 
-ifdef CONFIG_XPL_BUILD
-ifndef CONFIG_TPL_BUILD
+ifdef CONFIG_SPL_BUILD
 ifdef CONFIG_SPL_INIT_MINIMAL
 MINIMAL=y
 endif
 endif
-endif
 
 obj-y	+= bdinfo.o
 
-- 
2.43.0