Thread (11 messages) 11 messages, 5 authors, 2017-06-17
STALE3295d
Revisions (2)
  1. v4 current
  2. v5 [diff vs current]

[PATCH v4 3/4] MIPS: DTS: img: Don't attempt to build-in all .dtb files

From: Paul Burton <hidden>
Date: 2017-06-02 18:21:50
Subsystem: mips, the rest · Maintainers: Thomas Bogendoerfer, Linus Torvalds

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 <redacted>
Cc: Rahul Bedarkar <redacted>
Cc: Ralf Baechle <redacted>
Cc: linux-mips@linux-mips.org

---

Changes in v4:
- New patch.

Changes in v3: None
Changes in v2: None

 arch/mips/boot/dts/img/Makefile | 3 +--
 1 file changed, 1 insertion(+), 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
-- 
2.13.0
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help