This adjusts OF_UPSTREAM to behave more like the kernel by allowing for
all the devicetree files for a given vendor to be compiled. This is
useful for Qualcomm in particular as most boards are supported by a
single U-Boot build just provided with a different DT.
Signed-off-by: Caleb Connolly <caleb.conno...@linaro.org>
---
dts/Kconfig | 24 ++++++++++++++++++++++++
scripts/Makefile.dts | 13 +++++++++++++
2 files changed, 37 insertions(+)
diff --git a/dts/Kconfig b/dts/Kconfig
index b9b6367154ef..6883a000a052 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -100,8 +100,32 @@ config OF_UPSTREAM
However, newer boards whose devicetree source files haven't landed in
the dts/upstream subtree, they can override this option to have the
DT build from existing U-Boot tree location instead.
+config OF_UPSTREAM_BUILD_VENDOR
+ bool "Build all devicetree files for a particular vendor"
+ depends on OF_UPSTREAM
+ help
+ Enable building all devicetree files for a particular vendor. This
+ is useful for generic U-Boot configurations where many boards can
+ be supported with a single binary.
+
+ This is only available for platforms using upstream devicetree.
+
+config OF_UPSTREAM_VENDOR
+ string "Vendor to build all upstream devicetree files for"
+ depends on OF_UPSTREAM_BUILD_VENDOR
+ default "qcom" if ARCH_SNAPDRAGON
+ default "rockchip" if ARCH_ROCKCHIP
+ default "amlogic" if ARCH_MESON
+ default "allwinner" if ARCH_SUNXI
+ default "mediatek" if ARCH_MEDIATEK
+ default "marvell" if ARCH_MVEBU || ARCH_KIRKWOOD
+ default "xilinx" if ARCH_VERSAL || ARCH_ZYNQ
+ default "nvidia" if ARCH_TEGRA
+ help
+ Select the vendor to build all devicetree files for.
+
choice
prompt "Provider of DTB for DT control"
depends on OF_CONTROL
diff --git a/scripts/Makefile.dts b/scripts/Makefile.dts
index 5e2429c6170c..790f3c508f19 100644
--- a/scripts/Makefile.dts
+++ b/scripts/Makefile.dts
@@ -1,3 +1,16 @@
# SPDX-License-Identifier: GPL-2.0+
dtb-y += $(patsubst %,%.dtb,$(subst ",,$(CONFIG_DEFAULT_DEVICE_TREE)
$(CONFIG_OF_LIST) $(CONFIG_SPL_OF_LIST)))
+
+ifeq ($(CONFIG_OF_UPSTREAM_BUILD_VENDOR),y)
+ifeq ($(CONFIG_ARM64),y)
+dt_dir := $(srctree)/dts/upstream/src/arm64
+else
+dt_dir := $(srctree)/dts/upstream/src/$(ARCH)
+endif
+
+dtb-vendor_dts := $(patsubst %.dts,%.dtb,$(wildcard $(dt_dir)/$(subst
",,$(CONFIG_OF_UPSTREAM_VENDOR))/*.dts))
+
+dtb-y += $(subst $(dt_dir)/,,$(dtb-vendor_dts))
+
+endif
--
2.44.0
