Skip to content

Commit

Permalink
MIPS: migrate to generic rule for built-in DTBs
Browse files Browse the repository at this point in the history 
Commit 654102d ("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>
  • Loading branch information
Masahiro Yamada authored and Thomas Bogendoerfer committed Jan 11, 2025
1 parent bc7584e commit 04e4ec9
Show file tree
Hide file tree
Showing 12 changed files with 2 additions and 24 deletions.
2 changes: 2 additions & 0 deletions arch/mips/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@ config MIPS
select ARCH_WANT_IPC_PARSE_VERSION
select ARCH_WANT_LD_ORPHAN_WARN
select BUILDTIME_TABLE_SORT
select BUILTIN_DTB_ALL if BUILTIN_DTB
select CLONE_BACKWARDS
select CPU_NO_EFFICIENT_FFS if (TARGET_ISA_REV < 1)
select CPU_PM if CPU_IDLE || SUSPEND
select GENERIC_ATOMIC64 if !64BIT
select GENERIC_BUILTIN_DTB if BUILTIN_DTB
select GENERIC_CMOS_UPDATE
select GENERIC_CPU_AUTOPROBE
select GENERIC_GETTIMEOFDAY
Expand Down
3 changes: 0 additions & 3 deletions arch/mips/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,9 +423,6 @@ endif

CLEAN_FILES += vmlinux.32 vmlinux.64

# device-trees
core-y += arch/mips/boot/dts/

archprepare:
ifdef CONFIG_MIPS32_N32
@$(kecho) ' Checking missing-syscalls for N32'
Expand Down
2 changes: 0 additions & 2 deletions arch/mips/boot/dts/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,3 @@ subdir-$(CONFIG_ATH79) += qca
subdir-$(CONFIG_RALINK) += ralink
subdir-$(CONFIG_MACH_REALTEK_RTL) += realtek
subdir-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += xilfpga

obj-$(CONFIG_BUILTIN_DTB) := $(addsuffix /, $(subdir-y))
2 changes: 0 additions & 2 deletions arch/mips/boot/dts/brcm/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,3 @@ dtb-$(CONFIG_DT_NONE) += \
bcm97420c.dtb \
bcm97425svmb.dtb \
bcm97435svmb.dtb

obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
2 changes: 0 additions & 2 deletions arch/mips/boot/dts/cavium-octeon/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb

obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
2 changes: 0 additions & 2 deletions arch/mips/boot/dts/ingenic/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ dtb-$(CONFIG_JZ4770_GCW0) += gcw0.dtb
dtb-$(CONFIG_JZ4780_CI20) += ci20.dtb
dtb-$(CONFIG_X1000_CU1000_NEO) += cu1000-neo.dtb
dtb-$(CONFIG_X1830_CU1830_NEO) += cu1830-neo.dtb

obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
2 changes: 0 additions & 2 deletions arch/mips/boot/dts/lantiq/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,2 @@
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_DT_EASY50712) += danube_easy50712.dtb

obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
2 changes: 0 additions & 2 deletions arch/mips/boot/dts/loongson/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,3 @@ dtb-$(CONFIG_MACH_LOONGSON64) += loongson64c_4core_rs780e.dtb
dtb-$(CONFIG_MACH_LOONGSON64) += loongson64c_8core_rs780e.dtb
dtb-$(CONFIG_MACH_LOONGSON64) += loongson64g_4core_ls7a.dtb
dtb-$(CONFIG_MACH_LOONGSON64) += loongson64v_4core_virtio.dtb

obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
3 changes: 0 additions & 3 deletions arch/mips/boot/dts/mscc/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ dtb-$(CONFIG_SOC_VCOREIII) += \
ocelot_pcb123.dtb \
serval_pcb105.dtb \
serval_pcb106.dtb


obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
2 changes: 0 additions & 2 deletions arch/mips/boot/dts/mti/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_MIPS_MALTA) += malta.dtb
dtb-$(CONFIG_LEGACY_BOARD_SEAD3) += sead3.dtb

obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
2 changes: 0 additions & 2 deletions arch/mips/boot/dts/pic32/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@ dtb-$(CONFIG_DTB_PIC32_MZDA_SK) += pic32mzda_sk.dtb

dtb-$(CONFIG_DTB_PIC32_NONE) += \
pic32mzda_sk.dtb

obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
2 changes: 0 additions & 2 deletions arch/mips/boot/dts/ralink/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ dtb-$(CONFIG_SOC_MT7621) += \
mt7621-gnubee-gb-pc1.dtb \
mt7621-gnubee-gb-pc2.dtb \
mt7621-tplink-hc220-g5-v1.dtb

obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

0 comments on commit 04e4ec9

Please sign in to comment.