Now that SPL means SPL (only) and is not defined for TPL, simplify some checks for SPL.
Signed-off-by: Simon Glass sjg@chromium.org ---
board/congatec/common/Makefile | 4 +--- board/freescale/common/Makefile | 4 +--- board/freescale/p1010rdb/Makefile | 4 +--- board/freescale/p1_p2_rdb_pc/Makefile | 4 +--- 4 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/board/congatec/common/Makefile b/board/congatec/common/Makefile index f8170d9c653..d4ddfbf9716 100644 --- a/board/congatec/common/Makefile +++ b/board/congatec/common/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
ifdef MINIMAL # necessary to create built-in.o diff --git a/board/freescale/common/Makefile b/board/freescale/common/Makefile index c491dc8b241..0e1dec49238 100644 --- a/board/freescale/common/Makefile +++ b/board/freescale/common/Makefile @@ -5,13 +5,11 @@
MINIMAL=
-ifdef CONFIG_XPL_BUILD -ifndef CONFIG_TPL_BUILD +ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_INIT_MINIMAL MINIMAL=y endif endif -endif
ifdef MINIMAL # necessary to create built-in.o diff --git a/board/freescale/p1010rdb/Makefile b/board/freescale/p1010rdb/Makefile index df4e8001d38..c56ed82cb50 100644 --- a/board/freescale/p1010rdb/Makefile +++ b/board/freescale/p1010rdb/Makefile @@ -4,13 +4,11 @@
MINIMAL=
-ifdef CONFIG_XPL_BUILD -ifndef CONFIG_TPL_BUILD +ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_INIT_MINIMAL MINIMAL=y endif endif -endif
ifdef MINIMAL obj-y += spl_minimal.o diff --git a/board/freescale/p1_p2_rdb_pc/Makefile b/board/freescale/p1_p2_rdb_pc/Makefile index 8c13813e3b0..38f2f53ff03 100644 --- a/board/freescale/p1_p2_rdb_pc/Makefile +++ b/board/freescale/p1_p2_rdb_pc/Makefile @@ -4,13 +4,11 @@
MINIMAL=
-ifdef CONFIG_XPL_BUILD -ifndef CONFIG_TPL_BUILD +ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_INIT_MINIMAL MINIMAL=y endif endif -endif
ifdef MINIMAL obj-y += spl_minimal.o