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 ---
drivers/mtd/Makefile | 2 +- drivers/mtd/nand/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index db010417b86..2388d2aa27c 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -16,7 +16,7 @@ mtd-$(CONFIG_RENESAS_RPC_HF) += renesas_rpc_hf.o mtd-$(CONFIG_HBMC_AM654) += hbmc-am654.o
# U-Boot build -ifeq ($(CONFIG_XPL_BUILD)$(CONFIG_TPL_BUILD),) +ifeq ($(CONFIG_XPL_BUILD),)
ifneq ($(mtd-y),) obj-y += mtd.o diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index 68b53dced1b..ad02095b35b 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0+
-ifeq ($(CONFIG_XPL_BUILD)$(CONFIG_TPL_BUILD),) +ifeq ($(CONFIG_XPL_BUILD),) nandcore-objs := core.o bbt.o obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o obj-$(CONFIG_MTD_RAW_NAND) += raw/