The XPL_BUILD symbol is set for all xPL phases, i.e. TPL, VPL and SPL. Conditional guards that test for both XPL_BUILD and TPL_BUILD symbols are therefore redundant.
Drop the redundant TPL_BUILD symbol check from conditional guards that also test for the XPL_BUILD symbol to cleanup from an old SPL to XPL symbol rename. Signed-off-by: Jonas Karlman <[email protected]> --- arch/arm/mach-rockchip/Makefile | 2 +- drivers/Makefile | 2 +- drivers/bus/Makefile | 2 +- drivers/mtd/Makefile | 2 +- drivers/mtd/nand/Makefile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-rockchip/Makefile b/arch/arm/mach-rockchip/Makefile index d3bc0689f893..8148816c48c8 100644 --- a/arch/arm/mach-rockchip/Makefile +++ b/arch/arm/mach-rockchip/Makefile @@ -15,7 +15,7 @@ obj-tpl-$(CONFIG_ROCKCHIP_PX30) += px30-board-tpl.o spl_common.o obj-spl-$(CONFIG_ROCKCHIP_RK3036) += rk3036-board-spl.o spl_common.o -ifeq ($(CONFIG_XPL_BUILD)$(CONFIG_TPL_BUILD),) +ifeq ($(CONFIG_XPL_BUILD),) # Always include boot_mode.o, as we bypass it (i.e. turn it off) # inside of boot_mode.c when CONFIG_ROCKCHIP_BOOT_MODE_REG is 0. This way, diff --git a/drivers/Makefile b/drivers/Makefile index 43d0ba332818..76d6d45d40e1 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -85,7 +85,7 @@ obj-$(CONFIG_TPL_MPC8XXX_INIT_DDR) += ddr/fsl/ endif -ifeq ($(CONFIG_XPL_BUILD)$(CONFIG_TPL_BUILD),) +ifeq ($(CONFIG_XPL_BUILD),) obj-y += ata/ obj-$(CONFIG_DM_DEMO) += demo/ diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile index 2d242bc2886b..239d9a35fe49 100644 --- a/drivers/bus/Makefile +++ b/drivers/bus/Makefile @@ -3,7 +3,7 @@ # Makefile for the bus drivers. # -ifeq ($(CONFIG_XPL_BUILD)$(CONFIG_TPL_BUILD),) +ifeq ($(CONFIG_XPL_BUILD),) obj-$(CONFIG_TI_PWMSS) += ti-pwmss.o obj-$(CONFIG_UNIPHIER_SYSTEM_BUS) += uniphier-system-bus.o endif diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index ce05e206073d..e204f19ff8be 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 c8169cf73902..cf53c5f601ea 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/ -- 2.54.0
