tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

MIPS: migrate to generic rule for built-in DTBs

Commit 654102df2ac2 ("kbuild: add generic support for built-in boot
DTBs") introduced generic support for built-in DTBs.

Select GENERIC_BUILTIN_DTB and BUILTIN_DTB_ALL when the built-in DTB
support is enabled.

DTBs compiled under arch/mips/boot/dts/ will be wrapped by the generic
rule in scripts/Makefile.vmlinux.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

authored by Masahiro Yamada and committed by Thomas Bogendoerfer 04e4ec98 bc7584e0

+2 -24
unified split
+2
arch/mips/Kconfig
··· 29 29 select ARCH_WANT_IPC_PARSE_VERSION 30 30 select ARCH_WANT_LD_ORPHAN_WARN 31 31 select BUILDTIME_TABLE_SORT 32 + select BUILTIN_DTB_ALL if BUILTIN_DTB 32 33 select CLONE_BACKWARDS 33 34 select CPU_NO_EFFICIENT_FFS if (TARGET_ISA_REV < 1) 34 35 select CPU_PM if CPU_IDLE || SUSPEND 35 36 select GENERIC_ATOMIC64 if !64BIT 37 + select GENERIC_BUILTIN_DTB if BUILTIN_DTB 36 38 select GENERIC_CMOS_UPDATE 37 39 select GENERIC_CPU_AUTOPROBE 38 40 select GENERIC_GETTIMEOFDAY
-3
arch/mips/Makefile
··· 423 423 424 424 CLEAN_FILES += vmlinux.32 vmlinux.64 425 425 426 - # device-trees 427 - core-y += arch/mips/boot/dts/ 428 - 429 426 archprepare: 430 427 ifdef CONFIG_MIPS32_N32 431 428 @$(kecho) ' Checking missing-syscalls for N32'
-2
arch/mips/boot/dts/Makefile
··· 16 16 subdir-$(CONFIG_RALINK) += ralink 17 17 subdir-$(CONFIG_MACH_REALTEK_RTL) += realtek 18 18 subdir-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += xilfpga 19 - 20 - obj-$(CONFIG_BUILTIN_DTB) := $(addsuffix /, $(subdir-y))
-2
arch/mips/boot/dts/brcm/Makefile
··· 33 33 bcm97420c.dtb \ 34 34 bcm97425svmb.dtb \ 35 35 bcm97435svmb.dtb 36 - 37 - obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
-2
arch/mips/boot/dts/cavium-octeon/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb 3 - 4 - obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
-2
arch/mips/boot/dts/ingenic/Makefile
··· 5 5 dtb-$(CONFIG_JZ4780_CI20) += ci20.dtb 6 6 dtb-$(CONFIG_X1000_CU1000_NEO) += cu1000-neo.dtb 7 7 dtb-$(CONFIG_X1830_CU1830_NEO) += cu1830-neo.dtb 8 - 9 - obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
-2
arch/mips/boot/dts/lantiq/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 dtb-$(CONFIG_DT_EASY50712) += danube_easy50712.dtb 3 - 4 - obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
-2
arch/mips/boot/dts/loongson/Makefile
··· 5 5 dtb-$(CONFIG_MACH_LOONGSON64) += loongson64c_8core_rs780e.dtb 6 6 dtb-$(CONFIG_MACH_LOONGSON64) += loongson64g_4core_ls7a.dtb 7 7 dtb-$(CONFIG_MACH_LOONGSON64) += loongson64v_4core_virtio.dtb 8 - 9 - obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
-3
arch/mips/boot/dts/mscc/Makefile
··· 8 8 ocelot_pcb123.dtb \ 9 9 serval_pcb105.dtb \ 10 10 serval_pcb106.dtb 11 - 12 - 13 - obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
-2
arch/mips/boot/dts/mti/Makefile
··· 1 1 # SPDX-License-Identifier: GPL-2.0 2 2 dtb-$(CONFIG_MIPS_MALTA) += malta.dtb 3 3 dtb-$(CONFIG_LEGACY_BOARD_SEAD3) += sead3.dtb 4 - 5 - obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
-2
arch/mips/boot/dts/pic32/Makefile
··· 3 3 4 4 dtb-$(CONFIG_DTB_PIC32_NONE) += \ 5 5 pic32mzda_sk.dtb 6 - 7 - obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
-2
arch/mips/boot/dts/ralink/Makefile
··· 10 10 mt7621-gnubee-gb-pc1.dtb \ 11 11 mt7621-gnubee-gb-pc2.dtb \ 12 12 mt7621-tplink-hc220-g5-v1.dtb 13 - 14 - obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))