[PATCH] Makefile: Fix of_list_dirs with EXT_DTB

[Aniket Limaye]

Hi Manorit,


On 26/06/25 16:13, Manorit Chawdhry wrote:
> 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 at ti.com>

Reviewed-by: Aniket Limaye <a-limaye at ti.com>

> ---
>   Makefile | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index e60bbb01a004c7801034a10e7f3fdd04f92f700d..f2a6fbad6d32c3b68292ff19bda4f4fdb686de63 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1392,17 +1392,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)
> 
> ---
> base-commit: 40e083353a1610276f12fdbe613bf12004452656
> change-id: 20250626-b4-upstream-fix-icssg-fit-b6a42952daea
> 
> Best regards,