MIPS: dts: Always descend vendor subdirectories

Commit 41528ba6afe6 ("MIPS: DTS: Only build subdir of current platform")
broke building of all DTBs when CONFIG_OF_ALL_DTBS is enabled unless all
the various kconfig options were also enabled. The only effect that commit
had was getting rid of some harmless build lines such as:

      AR      arch/mips/boot/dts/mti/built-in.a

Those lines were part of the built-in DTB support. Since commit
04e4ec98e405 ("MIPS: migrate to generic rule for built-in DTBs"), how the
built-in DTBs are handled has changed and those lines are no longer
generated, so revert to the prior behavior.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile
index 6d9dbe945541796ccf182f4ed424b9ce8b34de26..36c5e4c6e64064ae5988c158041722d8146558c6 100644 (file)
--- a/arch/mips/boot/dts/Makefile
+++ b/arch/mips/boot/dts/Makefile
@@ -1,20 +1,17 @@
 # SPDX-License-Identifier: GPL-2.0
-subdir-$(CONFIG_BMIPS_GENERIC)         += brcm
-subdir-$(CONFIG_CAVIUM_OCTEON_SOC)     += cavium-octeon
-subdir-$(CONFIG_ECONET)                        += econet
-subdir-$(CONFIG_EYEQ)                  += mobileye
-subdir-$(CONFIG_FIT_IMAGE_FDT_MARDUK)   += img
-subdir-$(CONFIG_FIT_IMAGE_FDT_BOSTON)  += img
-subdir-$(CONFIG_MACH_INGENIC)          += ingenic
-subdir-$(CONFIG_LANTIQ)                        += lantiq
-subdir-$(CONFIG_MACH_LOONGSON64)       += loongson
-subdir-$(CONFIG_MACH_LOONGSON32)       += loongson
-subdir-$(CONFIG_SOC_VCOREIII)          += mscc
-subdir-$(CONFIG_MIPS_MALTA)            += mti
-subdir-$(CONFIG_LEGACY_BOARD_SEAD3)    += mti
-subdir-$(CONFIG_FIT_IMAGE_FDT_NI169445)        += ni
-subdir-$(CONFIG_MACH_PIC32)            += pic32
-subdir-$(CONFIG_ATH79)                 += qca
-subdir-$(CONFIG_RALINK)                        += ralink
-subdir-$(CONFIG_MACH_REALTEK_RTL)      += realtek
-subdir-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += xilfpga
+subdir-y       += brcm
+subdir-y       += cavium-octeon
+subdir-y       += econet
+subdir-y       += mobileye
+subdir-y       += img
+subdir-y       += ingenic
+subdir-y       += lantiq
+subdir-y       += loongson
+subdir-y       += mscc
+subdir-y       += mti
+subdir-y       += ni
+subdir-y       += pic32
+subdir-y       += qca
+subdir-y       += ralink
+subdir-y       += realtek
+subdir-y       += xilfpga

diff --git a/arch/mips/boot/dts/realtek/Makefile b/arch/mips/boot/dts/realtek/Makefile
index d2709798763ffe2c61c63f91071c4935e48fc6f0..3ac795d8523651bfcfacbd40d87641de9ec8fdb2 100644 (file)
--- a/arch/mips/boot/dts/realtek/Makefile
+++ b/arch/mips/boot/dts/realtek/Makefile
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
-dtb-y  += cisco_sg220-26.dtb
-dtb-y  += cameo-rtl9302c-2x-rtl8224-2xge.dtb
+dtb-$(CONFIG_MACH_REALTEK_RTL) += cisco_sg220-26.dtb
+dtb-$(CONFIG_MACH_REALTEK_RTL) += cameo-rtl9302c-2x-rtl8224-2xge.dtb