From: Michal Simek <michal.simek@xilinx.com>
Date: Sat, 23 Mar 2019 05:43:00 +0000 (+0530)
Subject: Makefile: Prioritize external dtb if defined
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b92f1c7a038232651a7ab171a958f027cc893070;p=thirdparty%2Fu-boot.git

Makefile: Prioritize external dtb if defined

Prioritize external dtb if its passed via EXT_DTB
than the dtb that was built in the tree. With this
patch it appends the specified external dtb to
the u-boot image.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu@xilinx.com>
---

diff --git a/Makefile b/Makefile
index 6aa08964fff..ab0c42c133b 100755
--- a/Makefile
+++ b/Makefile
@@ -1020,8 +1020,13 @@ MKIMAGEFLAGS_fit-dtb.blob = -f auto -A $(ARCH) -T firmware -C none -O u-boot \
 	-a 0 -e 0 -E \
 	$(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) -d /dev/null
 
+ifneq ($(EXT_DTB),)
+u-boot-fit-dtb.bin: u-boot-nodtb.bin $(EXT_DTB)
+		$(call if_changed,cat)
+else
 u-boot-fit-dtb.bin: u-boot-nodtb.bin fit-dtb.blob
 	$(call if_changed,cat)
+endif
 
 u-boot.bin: u-boot-fit-dtb.bin FORCE
 	$(call if_changed,copy)