[PATCH RFC v3 08/11] ti: j721e: Exclude makefile tispl.bin target for J721E

Neha Malcom Francis
2022-06-15T06:49:39Z

tispl.bin is to be packaged (with ATF, OPTEE, DM and A72 SPL) using
binman. The tispl.bin target from the makefile is no longer needed for
J721E.

Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
---
arch/arm/mach-k3/config.mk | 5 +++++
scripts/Makefile.spl | 2 ++
2 files changed, 7 insertions(+)

diff --git a/arch/arm/mach-k3/config.mk b/arch/arm/mach-k3/config.mk
index d706d17788..dd5e42d9df 100644
--- a/arch/arm/mach-k3/config.mk
+++ b/arch/arm/mach-k3/config.mk
@@ -74,6 +74,7 @@ ifeq ($(CONFIG_SOC_K3_J721E),)
export DM := /dev/null
endif

+ifndef CONFIG_TARGET_J721E_A72_EVM
ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
SPL_ITS := u-boot-spl-k3_HS.its
$(SPL_ITS): export IS_HS=1
@@ -98,9 +99,11 @@ cmd_k3_mkits = \
$(SPL_ITS): FORCE
$(call cmd,k3_mkits)
endif
+endif

else

+ifndef CONFIG_TARGET_J721E_A72_EVM
ifeq ($(CONFIG_TI_SECURE_DEVICE),y)
INPUTS-y += u-boot.img_HS
else
@@ -108,4 +111,6 @@ INPUTS-y += u-boot.img
endif
endif

+endif
+
include $(srctree)/arch/arm/mach-k3/config_secure.mk
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
index f047d4e094..6104cb8587 100644
--- a/scripts/Makefile.spl
+++ b/scripts/Makefile.spl
@@ -591,6 +591,8 @@ $(obj)/$(SPL_BIN).multidtb.fit.lzo: $(obj)/$(SPL_BIN).multidtb.fit
@lzop -f9 $< > $@

ifdef CONFIG_ARCH_K3
+ifndef CONFIG_TARGET_J721E_A72_EVM
tispl.bin: $(obj)/u-boot-spl-nodtb.bin $(SHRUNK_ARCH_DTB) $(SPL_ITS) FORCE
$(call if_changed,mkfitimage)
endif
+endif
--
2.17.1