Skip to content

Commit 4d2804b

Browse files
paulburtonralfbaechle
authored andcommitted
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 daa1017 ("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 <[email protected]> Cc: Rahul Bedarkar <[email protected]> Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/16484/ Signed-off-by: Ralf Baechle <[email protected]>
1 parent 6b0fd6c commit 4d2804b

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

arch/mips/boot/dts/img/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
dtb-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb
2-
3-
obj-y += $(patsubst %.dtb, %.dtb.o, $(dtb-y))
2+
obj-$(CONFIG_MACH_PISTACHIO) += pistachio_marduk.dtb.o
43

54
# Force kbuild to make empty built-in.o if necessary
65
obj- += dummy.o

0 commit comments

Comments
 (0)