From d099db2829edace4595b90f25c84a5239ca72c41 Mon Sep 17 00:00:00 2001 From: Jean-Jacques Hiblot Date: Wed, 5 Aug 2020 22:44:16 +0530 Subject: [PATCH] arm: mach-k3: Fix platform hang when SPL_MULTI_DTB_FIT is not enabled If SPL_MULTI_DTB_FIT is not enabled, then CONFIG_SPL_OF_LIST is not defined And in turn tispl.bin ends up not embedding any DTB. Fixing it by using CONFIG_DEFAULT_DEVICE_TREE if SPL_OF_LIST is empty. Signed-off-by: Jean-Jacques Hiblot Signed-off-by: Lokesh Vutla --- arch/arm/mach-k3/config.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-k3/config.mk b/arch/arm/mach-k3/config.mk index c9538718e7..41fee2b5a1 100644 --- a/arch/arm/mach-k3/config.mk +++ b/arch/arm/mach-k3/config.mk @@ -58,10 +58,16 @@ SPL_ITS := u-boot-spl-k3.its INPUTS-y += tispl.bin endif +ifeq ($(CONFIG_SPL_OF_LIST),) +LIST_OF_DTB := $(CONFIG_DEFAULT_DEVICE_TREE) +else +LIST_OF_DTB := $(CONFIG_SPL_OF_LIST) +endif + quiet_cmd_k3_mkits = MKITS $@ cmd_k3_mkits = \ $(srctree)/tools/k3_fit_atf.sh \ - $(patsubst %,$(obj)/dts/%.dtb,$(subst ",,$(CONFIG_SPL_OF_LIST))) > $@ + $(patsubst %,$(obj)/dts/%.dtb,$(subst ",,$(LIST_OF_DTB))) > $@ $(SPL_ITS): FORCE $(call cmd,k3_mkits) -- 2.39.5