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>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0fb4b218f6658b72f659bd7952099371886363f0..47c1845f0b1bff9302dae30fc5d79e1618c81cbc 100644 (file)
--- 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 2ab936e4179dabb27896280716880d299ae2d262..4405d5b67578d6fdd30f2ec2b5b6e0de985cb231 100644 (file)
--- 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)