hi Tom, On Mon, 14 Aug 2023 at 20:34, Tom Rini <tr...@konsulko.com> wrote: > > On Mon, Aug 14, 2023 at 02:33:06PM +0530, Sughosh Ganu 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.g...@linaro.org> > > --- > > scripts/Makefile.lib | 11 +++++++---- > > 1 file changed, 7 insertions(+), 4 deletions(-) > > > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > > index f5ab7af0f4..f41b16781d 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 > > +include_files = $(strip $(u_boot_dtsi_options_debug) \ > > $(notdir $(firstword $(u_boot_dtsi_options)))) > > > > +# The CONFIG_DEVICE_TREE_INCLUDES also need to be included > > +include_files += $(CONFIG_DEVICE_TREE_INCLUDES) > > This is what I wanted, logic-wise, but I think include_files is too > vague.
Okay. How about dtsi_include_list, or dtsi_list? If not, can you suggest a name which you think would be apt. Thanks. -sughosh
