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.
Signed-off-by: Tom Rini <tr...@konsulko.com>
---
This becomes a problem if we remove identical header files from
arch/arm/dts for example and only always use the upstream one.
Cc: Sumit Garg <sumit.g...@kernel.org>
---
scripts/Makefile.lib | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index e89a4a51b74d..ac14e4f9dfb2 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 $<) \
--
2.43.0
