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