summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorManorit Chawdhry <[email protected]>2025-06-26 16:13:32 +0530
committerTom Rini <[email protected]>2025-07-08 16:19:31 -0600
commit29be3d7d055e7db475d0bbea27b4b3bbfa9e0aa5 (patch)
treea069b3f92a484de577719e01f7e3c8b3487f1c67 /Makefile
parent0707f73a8ba26f5aeaeada6f5942d003bf67ce06 (diff)
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 <[email protected]> Reviewed-by: Aniket Limaye <[email protected]>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
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)