From: Manorit Chawdhry <m-chawdhry@ti.com>
Date: Thu, 26 Jun 2025 10:43:32 +0000 (+0530)
Subject: Makefile: Fix of_list_dirs with EXT_DTB
X-Git-Tag: v2025.10-rc1~126
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29be3d7d055e7db475d0bbea27b4b3bbfa9e0aa5;p=thirdparty%2Fu-boot.git

Makefile: Fix of_list_dirs with EXT_DTB

EXT_DTB overrides the of_list_dirs that is passed to binman during
builds. This causes binman to not find the normal DTB paths and instead
it just is able to use the path for EXT_DTB only.

Add the default of_list_dirs that is used for normal binman builds to
EXT_DTB usecase as well.

Signed-off-by: Manorit Chawdhry <m-chawdhry@ti.com>
Reviewed-by: Aniket Limaye <a-limaye@ti.com>
---

diff --git a/Makefile b/Makefile
index da53efa09f1..b0e589c2eb0 100644
--- a/Makefile
+++ b/Makefile
@@ -1584,17 +1584,17 @@ ifneq ($(EXT_DTB),)
 ext_dtb_list := $(basename $(notdir $(EXT_DTB)))
 default_dt := $(firstword $(ext_dtb_list))
 of_list := "$(ext_dtb_list)"
-of_list_dirs := $(dir $(EXT_DTB))
+of_list_dirs := $(dir $(EXT_DTB)) $(dt_dir)
 else
 of_list := $(CONFIG_OF_LIST)
-ifneq ($(CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS),)
-of_list_dirs := $(dt_dir) arch/$(ARCH)/dts
-else
 of_list_dirs := $(dt_dir)
-endif
 default_dt := $(if $(DEVICE_TREE),$(DEVICE_TREE),$(CONFIG_DEFAULT_DEVICE_TREE))
 endif
 
+ifneq ($(CONFIG_OF_UPSTREAM_INCLUDE_LOCAL_FALLBACK_DTBOS),)
+of_list_dirs += arch/$(ARCH)/dts
+endif
+
 binman_dtb := $(shell echo $(CONFIG_BINMAN_DTB))
 ifeq ($(strip $(binman_dtb)),)
 ifeq ($(CONFIG_OF_EMBED),y)