summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKlaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>2021-02-09 21:41:55 +0300
committerTom Rini <trini@konsulko.com>2021-02-25 00:51:48 +0300
commit4e040b4d245a09c4c9e2c3a9e0b023c5eb00a452 (patch)
tree15bdf0e22d4b91640a2a4ac0c61b07ceb5742391 /Makefile
parentbdb7f2632bdc3baf910c5ef547df03df0ec0dbea (diff)
downloadu-boot-4e040b4d245a09c4c9e2c3a9e0b023c5eb00a452.tar.xz
Makefile: Add (default) DEVICE_TREE to SPL FIT
U-boot allows the default device tree to be overridden from the build environment using the DEVICE_TREE variable. Make sure that we include it in the SPL FIT mkimage build step. This also fixes a broken image in case CONFIG_OF_LIST and CONFIG_OF_OVERLAY_LIST are unset (i.e., expected to be supplied by the DEVICE_TREE env var). Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 4da46dea39..079881b62a 100644
--- a/Makefile
+++ b/Makefile
@@ -1386,6 +1386,7 @@ MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \
-a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \
-p $(CONFIG_FIT_EXTERNAL_OFFSET) \
-n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \
+ $(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(DEVICE_TREE))) \
$(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) \
$(patsubst %,-b arch/$(ARCH)/dts/%.dtbo,$(subst ",,$(CONFIG_OF_OVERLAY_LIST)))
else