[PATCH v2 1/6] scripts/Makefile.lib: Collate all dtsi files for inclusion

[Ilias Apalodimas]

On Thu, 17 Aug 2023 at 08:49, Sughosh Ganu <sughosh.ganu at linaro.org> wrote:
>
> At the time of building a device-tree file, all the *u-boot.dtsi files
> are looked for, in a particular order, and the first file found is
> included. Then, the list of files specified in the
> CONFIG_DEVICE_TREE_INCLUDES symbol are included.
>
> Combine these files that are to be included into a variable, and then
> include all these files in one go.
>
> Signed-off-by: Sughosh Ganu <sughosh.ganu at linaro.org>
> Reviewed-by: Tom Rini <trini at konsulko.com>
> ---
> Changes since V1: None
>
>  scripts/Makefile.lib | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index f5ab7af0f4..368b5a3e28 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -179,10 +179,13 @@ ifdef DEVICE_TREE_DEBUG
>  u_boot_dtsi_options_debug = $(warning $(u_boot_dtsi_options_raw))
>  endif
>
> -# We use the first match
> -u_boot_dtsi = $(strip $(u_boot_dtsi_options_debug) \
> +# We use the first match to be included
> +dtsi_include_list = $(strip $(u_boot_dtsi_options_debug) \
>         $(notdir $(firstword $(u_boot_dtsi_options))))
>
> +# The CONFIG_DEVICE_TREE_INCLUDES also need to be included
> +dtsi_include_list += $(CONFIG_DEVICE_TREE_INCLUDES)
> +
>  # Modified for U-Boot
>  dtc_cpp_flags  = -Wp,-MD,$(depfile).pre.tmp -nostdinc                    \
>                  $(UBOOTINCLUDE)                                         \
> @@ -320,8 +323,8 @@ quiet_cmd_dtc = DTC     $@
>  # Bring in any U-Boot-specific include at the end of the file
>  # And finally any custom .dtsi fragments specified with CONFIG_DEVICE_TREE_INCLUDES
>  cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \
> -       (cat $<; $(if $(u_boot_dtsi),echo '$(pound)include "$(u_boot_dtsi)"')) > $(pre-tmp); \
> -       $(foreach f,$(subst $(quote),,$(CONFIG_DEVICE_TREE_INCLUDES)), \
> +       (cat $< > $(pre-tmp)); \
> +       $(foreach f,$(subst $(quote),,$(dtsi_include_list)), \
>           echo '$(pound)include "$(f)"' >> $(pre-tmp);) \
>         $(HOSTCC) -E $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $(pre-tmp) ; \
>         $(DTC) -O dtb -o $@ -b 0 \
> --
> 2.34.1
>

Acked-by: Ilias Apalodimas <ilias.apalodimas at linaro.org>