Unverified Commit fca3aa16 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by James Hogan
Browse files

MIPS: dts: Avoid unneeded built-in.a in DTS dirs 



arch/mips/boot/dts/Makefile collects objects from sub-directories into
built-in.a only when CONFIG_BUILTIN_DTB is enabled. Reflect it also to
the sub-directory Makefiles. This suppresses unneeded built-in.a
creation in arch/mips/boot/dts/*/ directories.

While I am here, I replaced $(patsubst %.dtb, %.dtb.o, $(dtb-y)) with
$(addsuffix .o, $(dtb-y)) to simplify the code a little bit.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Mathieu Malaterre <malat@debian.org>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: linux-mips@linux-mips.org
Cc: devicetree@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/19099/


Signed-off-by: default avatarJames Hogan <jhogan@kernel.org>
parent 6d08b06e

arch/mips/boot/dts/brcm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -34,4 +34,4 @@ dtb-$(CONFIG_DT_NONE) += \ 
	bcm97425svmb.dtb \

	bcm97435svmb.dtb



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

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

+1 −1
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-y				+= $(patsubst %.dtb, %.dtb.o, $(dtb-y))
 
obj-$(CONFIG_BUILTIN_DTB)	+= $(addsuffix .o, $(dtb-y))

arch/mips/boot/dts/ingenic/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,4 +3,4 @@ dtb-$(CONFIG_JZ4740_QI_LB60) += qi_lb60.dtb 
dtb-$(CONFIG_JZ4770_GCW0)	+= gcw0.dtb

dtb-$(CONFIG_JZ4780_CI20)	+= ci20.dtb



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

arch/mips/boot/dts/lantiq/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

dtb-$(CONFIG_DT_EASY50712)	+= easy50712.dtb



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

arch/mips/boot/dts/mscc/Makefile

+1 −1
Original line number Diff line number Diff line 
dtb-$(CONFIG_LEGACY_BOARD_OCELOT)	+= ocelot_pcb123.dtb



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

CRA Git | Maintained and supported by SUSTech CRA and CCSE