Skip to content

Commit 04e4ec9

Browse files
masahir0ytsbogend
masahir0y
authored and
tsbogend
committed
MIPS: migrate to generic rule for built-in DTBs
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 <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent bc7584e commit 04e4ec9

File tree

12 files changed

+2
-24
lines changed

12 files changed

+2
-24
lines changed

‎arch/mips/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ config MIPS
2929
select ARCH_WANT_IPC_PARSE_VERSION
3030
select ARCH_WANT_LD_ORPHAN_WARN
3131
select BUILDTIME_TABLE_SORT
32+
select BUILTIN_DTB_ALL if BUILTIN_DTB
3233
select CLONE_BACKWARDS
3334
select CPU_NO_EFFICIENT_FFS if (TARGET_ISA_REV < 1)
3435
select CPU_PM if CPU_IDLE || SUSPEND
3536
select GENERIC_ATOMIC64 if !64BIT
37+
select GENERIC_BUILTIN_DTB if BUILTIN_DTB
3638
select GENERIC_CMOS_UPDATE
3739
select GENERIC_CPU_AUTOPROBE
3840
select GENERIC_GETTIMEOFDAY

‎arch/mips/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -423,9 +423,6 @@ endif
423423

424424
CLEAN_FILES += vmlinux.32 vmlinux.64
425425

426-
# device-trees
427-
core-y += arch/mips/boot/dts/
428-
429426
archprepare:
430427
ifdef CONFIG_MIPS32_N32
431428
@$(kecho) ' Checking missing-syscalls for N32'

‎arch/mips/boot/dts/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,3 @@ subdir-$(CONFIG_ATH79) += qca
1616
subdir-$(CONFIG_RALINK) += ralink
1717
subdir-$(CONFIG_MACH_REALTEK_RTL) += realtek
1818
subdir-$(CONFIG_FIT_IMAGE_FDT_XILFPGA) += xilfpga
19-
20-
obj-$(CONFIG_BUILTIN_DTB) := $(addsuffix /, $(subdir-y))

‎arch/mips/boot/dts/brcm/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,3 @@ dtb-$(CONFIG_DT_NONE) += \
3333
bcm97420c.dtb \
3434
bcm97425svmb.dtb \
3535
bcm97435svmb.dtb
36-
37-
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

‎arch/mips/boot/dts/cavium-octeon/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
# SPDX-License-Identifier: GPL-2.0
22
dtb-$(CONFIG_CAVIUM_OCTEON_SOC) += octeon_3xxx.dtb octeon_68xx.dtb
3-
4-
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

‎arch/mips/boot/dts/ingenic/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ dtb-$(CONFIG_JZ4770_GCW0) += gcw0.dtb
55
dtb-$(CONFIG_JZ4780_CI20) += ci20.dtb
66
dtb-$(CONFIG_X1000_CU1000_NEO) += cu1000-neo.dtb
77
dtb-$(CONFIG_X1830_CU1830_NEO) += cu1830-neo.dtb
8-
9-
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

‎arch/mips/boot/dts/lantiq/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
# SPDX-License-Identifier: GPL-2.0
22
dtb-$(CONFIG_DT_EASY50712) += danube_easy50712.dtb
3-
4-
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

‎arch/mips/boot/dts/loongson/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ dtb-$(CONFIG_MACH_LOONGSON64) += loongson64c_4core_rs780e.dtb
55
dtb-$(CONFIG_MACH_LOONGSON64) += loongson64c_8core_rs780e.dtb
66
dtb-$(CONFIG_MACH_LOONGSON64) += loongson64g_4core_ls7a.dtb
77
dtb-$(CONFIG_MACH_LOONGSON64) += loongson64v_4core_virtio.dtb
8-
9-
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

‎arch/mips/boot/dts/mscc/Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,3 @@ dtb-$(CONFIG_SOC_VCOREIII) += \
88
ocelot_pcb123.dtb \
99
serval_pcb105.dtb \
1010
serval_pcb106.dtb
11-
12-
13-
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

‎arch/mips/boot/dts/mti/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
# SPDX-License-Identifier: GPL-2.0
22
dtb-$(CONFIG_MIPS_MALTA) += malta.dtb
33
dtb-$(CONFIG_LEGACY_BOARD_SEAD3) += sead3.dtb
4-
5-
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

‎arch/mips/boot/dts/pic32/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,3 @@ dtb-$(CONFIG_DTB_PIC32_MZDA_SK) += pic32mzda_sk.dtb
33

44
dtb-$(CONFIG_DTB_PIC32_NONE) += \
55
pic32mzda_sk.dtb
6-
7-
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

‎arch/mips/boot/dts/ralink/Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,3 @@ dtb-$(CONFIG_SOC_MT7621) += \
1010
mt7621-gnubee-gb-pc1.dtb \
1111
mt7621-gnubee-gb-pc2.dtb \
1212
mt7621-tplink-hc220-g5-v1.dtb
13-
14-
obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))

0 commit comments

Comments
 (0)