From c8c5e2b84d5d928472b68a51854b727ee90295b2 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Sat, 23 Mar 2019 11:13:00 +0530 Subject: [PATCH] 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 Signed-off-by: Siva Durga Prasad Paladugu Reviewed-by: Simon Glass --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Makefile b/Makefile index 2824a6e159..66a09ac900 100644 --- a/Makefile +++ b/Makefile @@ -1052,8 +1052,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 $(FINAL_DTB_CONTAINER) $(call if_changed,cat) +endif u-boot.bin: u-boot-fit-dtb.bin FORCE $(call if_changed,copy) -- 2.25.1