Skip to content

Commit 4f0b3cd

Browse files
robherringtsbogend
authored andcommitted
MIPS: dts: Always descend vendor subdirectories
Commit 41528ba ("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 04e4ec9 ("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>
1 parent eb6ac26 commit 4f0b3cd

2 files changed

Lines changed: 18 additions & 21 deletions

File tree

arch/mips/boot/dts/Makefile

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
subdir-$(CONFIG_BMIPS_GENERIC) += brcm
3-
subdir-$(CONFIG_CAVIUM_OCTEON_SOC) += cavium-octeon
4-
subdir-$(CONFIG_ECONET) += econet
5-
subdir-$(CONFIG_EYEQ) += mobileye
6-
subdir-$(CONFIG_FIT_IMAGE_FDT_MARDUK) += img
7-
subdir-$(CONFIG_FIT_IMAGE_FDT_BOSTON) += img
8-
subdir-$(CONFIG_MACH_INGENIC) += ingenic
9-
subdir-$(CONFIG_LANTIQ) += lantiq
10-
subdir-$(CONFIG_MACH_LOONGSON64) += loongson
11-
subdir-$(CONFIG_MACH_LOONGSON32) += loongson
12-
subdir-$(CONFIG_SOC_VCOREIII) += mscc
13-
subdir-$(CONFIG_MIPS_MALTA) += mti
14-
subdir-$(CONFIG_LEGACY_BOARD_SEAD3) += mti
15-
subdir-$(CONFIG_FIT_IMAGE_FDT_NI169445) += ni
16-
subdir-$(CONFIG_MACH_PIC32) += pic32
17-
subdir-$(CONFIG_ATH79) += qca
18-
subdir-$(CONFIG_RALINK) += ralink
19-
subdir-$(CONFIG_MACH_REALTEK_RTL) += realtek
20-
subdir-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += xilfpga
2+
subdir-y += brcm
3+
subdir-y += cavium-octeon
4+
subdir-y += econet
5+
subdir-y += mobileye
6+
subdir-y += img
7+
subdir-y += ingenic
8+
subdir-y += lantiq
9+
subdir-y += loongson
10+
subdir-y += mscc
11+
subdir-y += mti
12+
subdir-y += ni
13+
subdir-y += pic32
14+
subdir-y += qca
15+
subdir-y += ralink
16+
subdir-y += realtek
17+
subdir-y += xilfpga
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0
2-
dtb-y += cisco_sg220-26.dtb
3-
dtb-y += cameo-rtl9302c-2x-rtl8224-2xge.dtb
2+
dtb-$(CONFIG_MACH_REALTEK_RTL) += cisco_sg220-26.dtb
3+
dtb-$(CONFIG_MACH_REALTEK_RTL) += cameo-rtl9302c-2x-rtl8224-2xge.dtb

0 commit comments

Comments
 (0)