[PATCH 3/4] kbuild: Support flat DTBs install

From: Rob Herring <robh@kernel.org>
To: soc@kernel.org, "Christian Marangi" <ansuelsmth@gmail.com>,
	"Krzysztof Kozlowski" <krzysztof.kozlowski+dt@linaro.org>,
	"Russell King" <linux@armlinux.org.uk>,
	"Masahiro Yamada" <masahiroy@kernel.org>,
	"Andreas Färber" <afaerber@suse.de>,
	"Manivannan Sadhasivam" <mani@kernel.org>,
	"Shawn Guo" <shawnguo@kernel.org>,
	"Sascha Hauer" <s.hauer@pengutronix.de>,
	"Fabio Estevam" <festevam@gmail.com>,
	"Antoine Tenart" <atenart@kernel.org>,
	"Neil Armstrong" <neil.armstrong@linaro.org>,
	"Kevin Hilman" <khilman@baylibre.com>,
	"Jerome Brunet" <jbrunet@baylibre.com>,
	"Martin Blumenstingl" <martin.blumenstingl@googlemail.com>,
	"Linus Walleij" <linus.walleij@linaro.org>,
	"Sudeep Holla" <sudeep.holla@arm.com>,
	"Joel Stanley" <joel@jms.id.au>,
	"Nicolas Ferre" <nicolas.ferre@microchip.com>,
	"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
	"Claudiu Beznea" <claudiu.beznea@microchip.com>,
	"Lars Persson" <lars.persson@axis.com>,
	"Scott Branden" <sbranden@broadcom.com>,
	"Florian Fainelli" <f.fainelli@gmail.com>,
	"Andre Przywara" <andre.przywara@arm.com>,
	"Baruch Siach" <baruch@tkos.co.il>,
	"Wei Xu" <xuwei5@hisilicon.com>,
	"Jean-Marie Verdun" <verdun@hpe.com>,
	"Nick Hawkins" <nick.hawkins@hpe.com>,
	"Maxime Coquelin" <mcoquelin.stm32@gmail.com>,
	"Alexandre Torgue" <alexandre.torgue@foss.st.com>,
	"Vladimir Zapolskiy" <vz@mleia.com>,
	"Andrew Lunn" <andrew@lunn.ch>,
	"Gregory Clement" <gregory.clement@bootlin.com>,
	"Lubomir Rintel" <lkundrak@v3.sk>,
	"Matthias Brugger" <matthias.bgg@gmail.com>,
	"Peter Rosin" <peda@axentia.se>, "Nancy Yuen" <yuenn@google.com>,
	"Benjamin Fair" <benjaminfair@google.com>,
	"Jonathan Neuschäfer" <j.neuschaefer@gmx.net>,
	"Thierry Reding" <thierry.reding@gmail.com>,
	"Bjorn Andersson" <andersson@kernel.org>,
	"Geert Uytterhoeven" <geert+renesas@glider.be>,
	"Heiko Stuebner" <heiko@sntech.de>,
	"Daniel Palmer" <daniel@thingy.jp>,
	"Romain Perier" <romain.perier@gmail.com>,
	"Kunihiko Hayashi" <hayashi.kunihiko@socionext.com>,
	"Masami Hiramatsu" <mhiramat@kernel.org>,
	"Viresh Kumar" <vireshk@kernel.org>,
	"Shiraz Hashim" <shiraz.linux.kernel@gmail.com>,
	"Patrice Chotard" <patrice.chotard@foss.st.com>,
	"Marek Vasut" <marex@denx.de>, "Qin Jian" <qinjian@cqplus1.com>,
	"Jisheng Zhang" <jszhang@kernel.org>,
	"Tony Lindgren" <tony@atomide.com>,
	"Paul Barker" <paul.barker@sancloud.com>,
	"Bartosz Golaszewski" <brgl@bgdev.pl>,
	"Nishanth Menon" <nm@ti.com>,
	"Santosh Shilimkar" <ssantosh@kernel.org>,
	"Enric Balletbo i Serra" <eballetbo@gmail.com>,
	"Javier Martinez Canillas" <javier@dowhile0.org>,
	"Michal Simek" <michal.simek@xilinx.com>
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-arm-kernel@axis.com
Subject: [PATCH 3/4] kbuild: Support flat DTBs install
Date: Thu, 04 May 2023 22:29:28 -0500	[thread overview]
Message-ID: <20230504-arm-dts-mv-v1-3-2c8e51a2b6c4@kernel.org> (raw)
In-Reply-To: <20230504-arm-dts-mv-v1-0-2c8e51a2b6c4@kernel.org>

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>
---
 arch/arm/Kconfig         | 3 +++
 scripts/Makefile.dtbinst | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e24a9820e12f..7a3b1176f19d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1463,6 +1463,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)

-- 
2.39.2

