From: Michal Simek <michal.simek@xilinx.com>
Date: Mon, 25 Mar 2019 14:55:16 +0000 (+0100)
Subject: Makefile: Prioritize external dtb if defined
X-Git-Tag: v2019.07-rc3~22^2~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3eaf6dcd9362b56e3217559401287dd8fa35b5b2;p=oweals%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>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/Makefile b/Makefile
index 059978bfe6..6eb08a5724 100644
--- a/Makefile
+++ b/Makefile
@@ -1071,7 +1071,7 @@ 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 $(FINAL_DTB_CONTAINER)
+u-boot-fit-dtb.bin: u-boot-nodtb.bin fit-dtb.blob $(FINAL_DTB_CONTAINER)
 	$(call if_changed,cat)
 endif