summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2018-12-06 10:29:51 -0600
committerRob Herring <robh@kernel.org>2023-06-21 07:51:08 -0600
commit6a1d798feb65d2a67e6e2cafb0b0e4f430603226 (patch)
tree408d10e0040f5cfd425917524d8846bd5464560d
parent86684c2481b6e6a46c2282acee13554e34e66071 (diff)
downloadlinux-6a1d798feb65d2a67e6e2cafb0b0e4f430603226.tar.gz
linux-6a1d798feb65d2a67e6e2cafb0b0e4f430603226.tar.bz2
linux-6a1d798feb65d2a67e6e2cafb0b0e4f430603226.zip
kbuild: Support flat DTBs install
In preparation to move Arm .dts files into sub-directories grouped by vendor/family, the current flat tree of DTBs generated by dtbs_install needs to be maintained. Moving the installed DTBs to sub-directories would break various consumers using 'make dtbs_install'. This is a NOP until sub-directories are introduced. Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r--arch/arm/Kconfig3
-rw-r--r--scripts/Makefile.dtbinst2
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0fb4b218f665..47c1845f0b1b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1460,6 +1460,9 @@ config USE_OF
help
Include support for flattened device tree machine descriptions.
+config ARCH_WANT_FLAT_DTB_INSTALL
+ def_bool y
+
config ATAGS
bool "Support for the traditional ATAGS boot data passing"
default y
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
index 2ab936e4179d..4405d5b67578 100644
--- a/scripts/Makefile.dtbinst
+++ b/scripts/Makefile.dtbinst
@@ -34,6 +34,6 @@ $(dst)/%.dtbo: $(obj)/%.dtbo
PHONY += $(subdirs)
$(subdirs):
- $(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@)
+ $(Q)$(MAKE) $(dtbinst)=$@ dst=$(if $(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@))
.PHONY: $(PHONY)