From: Tom Rini Date: Wed, 28 May 2025 23:27:04 +0000 (-0600) Subject: scripts/Makefile.lib: Rework upstream_dtsi_include to get subdirectories X-Git-Tag: v2025.10-rc1~118^2~34^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9b452acd95312e3ca2a44c6b969399f191764bb;p=thirdparty%2Fu-boot.git scripts/Makefile.lib: Rework upstream_dtsi_include to get subdirectories A problem with the logic in upstream_dtsi_include currently is that it does not list directories such as dts/upstream/src/arm/nxp/imx and so will not findi "imx6ul-pinfunc.h" for example as it is normally and correctly included without vendor sub-paths. Expand the current wildcard glob to catch these directories too. Reviewed-by: Peter Robinson Signed-off-by: Tom Rini --- diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index e89a4a51b74..ac14e4f9dfb 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -205,8 +205,10 @@ dtsi_include_list = $(strip $(u_boot_dtsi_options_debug) \ # Modified for U-Boot upstream_dtsi_include = $(addprefix -I, $(srctree)/dts/upstream/src/ \ $(sort $(dir $(wildcard $(srctree)/dts/upstream/src/$(ARCH)/*/*))) \ + $(sort $(dir $(wildcard $(srctree)/dts/upstream/src/$(ARCH)/*/*/*))) \ $(if (CONFIG_ARM64), \ - $(sort $(dir $(wildcard $(srctree)/dts/upstream/src/arm64/*/*))))) + $(sort $(dir $(wildcard $(srctree)/dts/upstream/src/arm64/*/*))) \ + $(sort $(dir $(wildcard $(srctree)/dts/upstream/src/arm64/*/*/*))))) dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ $(UBOOTINCLUDE) \ -I$(dir $<) \