MIPS: dts: Always descend vendor subdirectories
Subsystems (2)
Rob Herring (Arm)
maintainerPATCH 1/1 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.
--- arch/mips/boot/dts/Makefile | 35 +++++++++++++---------------- arch/mips/boot/dts/realtek/Makefile | 4 ++-- 2 files changed, 18 insertions(+), 21 deletions(-)
arch/mips/boot/dts/Makefile +16 -19
@@ -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
arch/mips/boot/dts/realtek/Makefile +2 -2
@@ -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
Signature · 1 line
2.51.0
Quoted 12 lines · Rob Herring (Arm)
Commit
41528ba6afe6("MIPS: DTS: Only build subdir of current platform") broke building of all DTBs whenCONFIG_OF_ALL_DTBSis 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.aThose 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.
Quoted 5 lines
Signed-off-by Rob Herring (Arm) <[email protected]>--- arch/mips/boot/dts/Makefile | 35 +++++++++++++---------------- arch/mips/boot/dts/realtek/Makefile | 4 ++-- 2 files changed, 18 insertions(+), 21 deletions(-)
applied to mips-next.
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]