Commit 04e4ec98 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Thomas Bogendoerfer
Browse files

MIPS: migrate to generic rule for built-in DTBs 



Commit 654102df ("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: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent bc7584e0

arch/mips/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -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

arch/mips/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -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'

arch/mips/boot/dts/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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))

arch/mips/boot/dts/brcm/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -33,5 +33,3 @@ dtb-$(CONFIG_DT_NONE) += \ 
	bcm97420c.dtb \

	bcm97425svmb.dtb \

	bcm97435svmb.dtb
 


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

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

+0 −2
Original line number Diff line number Diff line 
# 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))