| Message ID | 20231214135103.1606605-4-sumit.garg@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | An effort to bring DT bindings compliance within U-boot | expand |
Hi Sumit, On Thu, 14 Dec 2023 at 06:52, Sumit Garg <sumit.garg@linaro.org> wrote: > > Allow u-boot to build DTB from a different directory tree such that > *-u-boot.dtsi files can be included from a common location. Currently > that location is arch/$(ARCH)/dts/, so statically define that common > location. > > This is needed for platform owners to start building DTB files from > devicetree-rebasing directory but still being able to include > *-u-boot.dtsi files. > > Signed-off-by: Sumit Garg <sumit.garg@linaro.org> > --- > scripts/Makefile.lib | 25 ++++++++++++++----------- > 1 file changed, 14 insertions(+), 11 deletions(-) > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > index 27b9437027c..4a002b0e0ca 100644 > --- a/scripts/Makefile.lib > +++ b/scripts/Makefile.lib > @@ -159,18 +159,20 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE) \ > ld_flags = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) > > # Try these files in order to find the U-Boot-specific .dtsi include file > -u_boot_dtsi_options = $(strip $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \ > - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \ > - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \ > - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \ > - $(wildcard $(dir $<)u-boot.dtsi)) > +UBOOT_DTSI_LOC = $(srctree)/arch/$(ARCH)/dts/ How about lower case since it is internal. Also we know it is U-Boot, so perhap dtsi_loc ? Otherwise looks OK to me. > + > +u_boot_dtsi_options = $(strip $(wildcard $(UBOOT_DTSI_LOC)$(basename $(notdir $<))-u-boot.dtsi) \ > + $(wildcard $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \ > + $(wildcard $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \ > + $(wildcard $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \ > + $(wildcard $(UBOOT_DTSI_LOC)u-boot.dtsi)) > > u_boot_dtsi_options_raw = $(warning Automatic .dtsi inclusion: options: \ > - $(dir $<)$(basename $(notdir $<))-u-boot.dtsi \ > - $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi \ > - $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi \ > - $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi \ > - $(dir $<)u-boot.dtsi ... \ > + $(UBOOT_DTSI_LOC)$(basename $(notdir $<))-u-boot.dtsi \ > + $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi \ > + $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi \ > + $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi \ > + $(UBOOT_DTSI_LOC)u-boot.dtsi ... \ > found: $(if $(u_boot_dtsi_options),"$(u_boot_dtsi_options)",nothing!)) > > # Uncomment for debugging > @@ -190,6 +192,7 @@ dtsi_include_list += $(CONFIG_DEVICE_TREE_INCLUDES) > dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ > $(UBOOTINCLUDE) \ > -I$(dir $<) \ > + -I$(UBOOT_DTSI_LOC) \ > -I$(srctree)/arch/$(ARCH)/dts/include \ > -I$(srctree)/include \ > -D__ASSEMBLY__ \ > @@ -328,7 +331,7 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ > 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 \ > - -i $(dir $<) $(DTC_FLAGS) \ > + -i $(dir $<) -i $(UBOOT_DTSI_LOC) $(DTC_FLAGS) \ > -d $(depfile).dtc.tmp $(dtc-tmp) || \ > (echo "Check $(shell pwd)/$(pre-tmp) for errors" && false) \ > ; \ > -- > 2.34.1 > Regards, Simon
On Wed, 20 Dec 2023 at 10:17, Simon Glass <sjg@chromium.org> wrote: > > Hi Sumit, > > On Thu, 14 Dec 2023 at 06:52, Sumit Garg <sumit.garg@linaro.org> wrote: > > > > Allow u-boot to build DTB from a different directory tree such that > > *-u-boot.dtsi files can be included from a common location. Currently > > that location is arch/$(ARCH)/dts/, so statically define that common > > location. > > > > This is needed for platform owners to start building DTB files from > > devicetree-rebasing directory but still being able to include > > *-u-boot.dtsi files. > > > > Signed-off-by: Sumit Garg <sumit.garg@linaro.org> > > --- > > scripts/Makefile.lib | 25 ++++++++++++++----------- > > 1 file changed, 14 insertions(+), 11 deletions(-) > > > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > > index 27b9437027c..4a002b0e0ca 100644 > > --- a/scripts/Makefile.lib > > +++ b/scripts/Makefile.lib > > @@ -159,18 +159,20 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE) \ > > ld_flags = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) > > > > # Try these files in order to find the U-Boot-specific .dtsi include file > > -u_boot_dtsi_options = $(strip $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \ > > - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \ > > - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \ > > - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \ > > - $(wildcard $(dir $<)u-boot.dtsi)) > > +UBOOT_DTSI_LOC = $(srctree)/arch/$(ARCH)/dts/ > > How about lower case since it is internal. Also we know it is U-Boot, > so perhap ? Although I just named it after *-u-boot.dtsi, I am fine with dtsi_loc too. So I will use that instead. > > Otherwise looks OK to me. Thanks, -Sumit > > > + > > +u_boot_dtsi_options = $(strip $(wildcard $(UBOOT_DTSI_LOC)$(basename $(notdir $<))-u-boot.dtsi) \ > > + $(wildcard $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \ > > + $(wildcard $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \ > > + $(wildcard $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \ > > + $(wildcard $(UBOOT_DTSI_LOC)u-boot.dtsi)) > > > > u_boot_dtsi_options_raw = $(warning Automatic .dtsi inclusion: options: \ > > - $(dir $<)$(basename $(notdir $<))-u-boot.dtsi \ > > - $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi \ > > - $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi \ > > - $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi \ > > - $(dir $<)u-boot.dtsi ... \ > > + $(UBOOT_DTSI_LOC)$(basename $(notdir $<))-u-boot.dtsi \ > > + $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi \ > > + $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi \ > > + $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi \ > > + $(UBOOT_DTSI_LOC)u-boot.dtsi ... \ > > found: $(if $(u_boot_dtsi_options),"$(u_boot_dtsi_options)",nothing!)) > > > > # Uncomment for debugging > > @@ -190,6 +192,7 @@ dtsi_include_list += $(CONFIG_DEVICE_TREE_INCLUDES) > > dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ > > $(UBOOTINCLUDE) \ > > -I$(dir $<) \ > > + -I$(UBOOT_DTSI_LOC) \ > > -I$(srctree)/arch/$(ARCH)/dts/include \ > > -I$(srctree)/include \ > > -D__ASSEMBLY__ \ > > @@ -328,7 +331,7 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ > > 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 \ > > - -i $(dir $<) $(DTC_FLAGS) \ > > + -i $(dir $<) -i $(UBOOT_DTSI_LOC) $(DTC_FLAGS) \ > > -d $(depfile).dtc.tmp $(dtc-tmp) || \ > > (echo "Check $(shell pwd)/$(pre-tmp) for errors" && false) \ > > ; \ > > -- > > 2.34.1 > > > > Regards, > Simon
On Wed, Dec 20, 2023 at 05:00:20PM +0530, Sumit Garg wrote: > On Wed, 20 Dec 2023 at 10:17, Simon Glass <sjg@chromium.org> wrote: > > > > Hi Sumit, > > > > On Thu, 14 Dec 2023 at 06:52, Sumit Garg <sumit.garg@linaro.org> wrote: > > > > > > Allow u-boot to build DTB from a different directory tree such that > > > *-u-boot.dtsi files can be included from a common location. Currently > > > that location is arch/$(ARCH)/dts/, so statically define that common > > > location. > > > > > > This is needed for platform owners to start building DTB files from > > > devicetree-rebasing directory but still being able to include > > > *-u-boot.dtsi files. > > > > > > Signed-off-by: Sumit Garg <sumit.garg@linaro.org> > > > --- > > > scripts/Makefile.lib | 25 ++++++++++++++----------- > > > 1 file changed, 14 insertions(+), 11 deletions(-) > > > > > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > > > index 27b9437027c..4a002b0e0ca 100644 > > > --- a/scripts/Makefile.lib > > > +++ b/scripts/Makefile.lib > > > @@ -159,18 +159,20 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE) \ > > > ld_flags = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) > > > > > > # Try these files in order to find the U-Boot-specific .dtsi include file > > > -u_boot_dtsi_options = $(strip $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \ > > > - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \ > > > - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \ > > > - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \ > > > - $(wildcard $(dir $<)u-boot.dtsi)) > > > +UBOOT_DTSI_LOC = $(srctree)/arch/$(ARCH)/dts/ > > > > How about lower case since it is internal. Also we know it is U-Boot, > > so perhap ? > > Although I just named it after *-u-boot.dtsi, I am fine with dtsi_loc > too. So I will use that instead. I was going to say lets use "uboot_dtsi_loc" so it's both clear what the variable does and for future re-syncs.
On Wed, 20 Dec 2023 at 18:59, Tom Rini <trini@konsulko.com> wrote: > > On Wed, Dec 20, 2023 at 05:00:20PM +0530, Sumit Garg wrote: > > On Wed, 20 Dec 2023 at 10:17, Simon Glass <sjg@chromium.org> wrote: > > > > > > Hi Sumit, > > > > > > On Thu, 14 Dec 2023 at 06:52, Sumit Garg <sumit.garg@linaro.org> wrote: > > > > > > > > Allow u-boot to build DTB from a different directory tree such that > > > > *-u-boot.dtsi files can be included from a common location. Currently > > > > that location is arch/$(ARCH)/dts/, so statically define that common > > > > location. > > > > > > > > This is needed for platform owners to start building DTB files from > > > > devicetree-rebasing directory but still being able to include > > > > *-u-boot.dtsi files. > > > > > > > > Signed-off-by: Sumit Garg <sumit.garg@linaro.org> > > > > --- > > > > scripts/Makefile.lib | 25 ++++++++++++++----------- > > > > 1 file changed, 14 insertions(+), 11 deletions(-) > > > > > > > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib > > > > index 27b9437027c..4a002b0e0ca 100644 > > > > --- a/scripts/Makefile.lib > > > > +++ b/scripts/Makefile.lib > > > > @@ -159,18 +159,20 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE) \ > > > > ld_flags = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) > > > > > > > > # Try these files in order to find the U-Boot-specific .dtsi include file > > > > -u_boot_dtsi_options = $(strip $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \ > > > > - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \ > > > > - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \ > > > > - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \ > > > > - $(wildcard $(dir $<)u-boot.dtsi)) > > > > +UBOOT_DTSI_LOC = $(srctree)/arch/$(ARCH)/dts/ > > > > > > How about lower case since it is internal. Also we know it is U-Boot, > > > so perhap ? > > > > Although I just named it after *-u-boot.dtsi, I am fine with dtsi_loc > > too. So I will use that instead. > > I was going to say lets use "uboot_dtsi_loc" so it's both clear what the > variable does and for future re-syncs. Okay that makes further sense. I will use it if I don't see any objection from Simon. -Sumit > > -- > Tom
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 27b9437027c..4a002b0e0ca 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -159,18 +159,20 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE) \ ld_flags = $(KBUILD_LDFLAGS) $(ldflags-y) $(LDFLAGS_$(@F)) # Try these files in order to find the U-Boot-specific .dtsi include file -u_boot_dtsi_options = $(strip $(wildcard $(dir $<)$(basename $(notdir $<))-u-boot.dtsi) \ - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \ - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \ - $(wildcard $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \ - $(wildcard $(dir $<)u-boot.dtsi)) +UBOOT_DTSI_LOC = $(srctree)/arch/$(ARCH)/dts/ + +u_boot_dtsi_options = $(strip $(wildcard $(UBOOT_DTSI_LOC)$(basename $(notdir $<))-u-boot.dtsi) \ + $(wildcard $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi) \ + $(wildcard $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi) \ + $(wildcard $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi) \ + $(wildcard $(UBOOT_DTSI_LOC)u-boot.dtsi)) u_boot_dtsi_options_raw = $(warning Automatic .dtsi inclusion: options: \ - $(dir $<)$(basename $(notdir $<))-u-boot.dtsi \ - $(dir $<)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi \ - $(dir $<)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi \ - $(dir $<)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi \ - $(dir $<)u-boot.dtsi ... \ + $(UBOOT_DTSI_LOC)$(basename $(notdir $<))-u-boot.dtsi \ + $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_SOC))-u-boot.dtsi \ + $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_CPU))-u-boot.dtsi \ + $(UBOOT_DTSI_LOC)$(subst $\",,$(CONFIG_SYS_VENDOR))-u-boot.dtsi \ + $(UBOOT_DTSI_LOC)u-boot.dtsi ... \ found: $(if $(u_boot_dtsi_options),"$(u_boot_dtsi_options)",nothing!)) # Uncomment for debugging @@ -190,6 +192,7 @@ dtsi_include_list += $(CONFIG_DEVICE_TREE_INCLUDES) dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ $(UBOOTINCLUDE) \ -I$(dir $<) \ + -I$(UBOOT_DTSI_LOC) \ -I$(srctree)/arch/$(ARCH)/dts/include \ -I$(srctree)/include \ -D__ASSEMBLY__ \ @@ -328,7 +331,7 @@ cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ 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 \ - -i $(dir $<) $(DTC_FLAGS) \ + -i $(dir $<) -i $(UBOOT_DTSI_LOC) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) || \ (echo "Check $(shell pwd)/$(pre-tmp) for errors" && false) \ ; \
Allow u-boot to build DTB from a different directory tree such that *-u-boot.dtsi files can be included from a common location. Currently that location is arch/$(ARCH)/dts/, so statically define that common location. This is needed for platform owners to start building DTB files from devicetree-rebasing directory but still being able to include *-u-boot.dtsi files. Signed-off-by: Sumit Garg <sumit.garg@linaro.org> --- scripts/Makefile.lib | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-)