summaryrefslogtreecommitdiffstats
path: root/arch/mips/boot
diff options
context:
space:
mode:
authorPaul Burton <paul.burton@imgtec.com>2017-06-17 22:52:48 +0200
committerRalf Baechle <ralf@linux-mips.org>2017-07-11 14:13:06 +0200
commit4d2804b7d76ef6e6cd85be74999548276d23067f (patch)
treef38f6ed9567a022bde116809a9417142169a6c78 /arch/mips/boot
parentclk: boston: Add a driver for MIPS Boston board clocks (diff)
downloadlinux-4d2804b7d76ef6e6cd85be74999548276d23067f.tar.xz
linux-4d2804b7d76ef6e6cd85be74999548276d23067f.zip
MIPS: DTS: img: Don't attempt to build-in all .dtb files
When building a FIT image we may want the kernel to build multiple .dtb files, but we don't want to build them all into the kernel binary as object files since they'll instead be included in the FIT image. Commit daa10170da27 ("MIPS: DTS: img: add device tree for Marduk board") however created arch/mips/boot/dts/img/Makefile with a line that builds any enabled .dtb files into the kernel. Remove this & build the pistachio object specifically, in preparation for adding .dtb targets which we don't want to build into the kernel. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: Rahul Bedarkar <rahulbedarkar89@gmail.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/16484/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/boot')
-rw-r--r--arch/mips/boot/dts/img/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/mips/boot/dts/img/Makefile b/arch/mips/boot/dts/img/Makefile
index 69a65f0f82d2..c178cf56f5b8 100644
--- a/arch/mips/boot/dts/img/Makefile
+++ b/arch/mips/boot/dts/img/Makefile
@@ -1,6 +1,5 @@
dtb-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb
-
-obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
+obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o
# Force kbuild to make empty built-in.o if necessary
obj- += dummy.o