]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
arm: mach-k3: Fix platform hang when SPL_MULTI_DTB_FIT is not enabled
authorJean-Jacques Hiblot <jjhiblot@ti.com>
Wed, 5 Aug 2020 17:14:16 +0000 (22:44 +0530)
committerLokesh Vutla <lokeshvutla@ti.com>
Tue, 11 Aug 2020 15:04:46 +0000 (20:34 +0530)
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 <jjhiblot@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
arch/arm/mach-k3/config.mk

index c9538718e7abd40b87f2b95850bc88c7c4443dfe..41fee2b5a172caa1ac8028cdfd487a21825b0484 100644 (file)
@@ -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)