[PATCH] mips: Fix dtb build rules

Sascha Hauer s.hauer at pengutronix.de
Tue Jun 10 23:34:53 PDT 2014


Add intermediate .S files to .SECONDARY. Otherwise make deletes them
and regenerates them each build.
Also remove KBUILD_DTBS since the make system descends in dts/ anyway.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/mips/Makefile     | 5 -----
 arch/mips/dts/Makefile | 5 ++++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index b3bacf3..a3cf112 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -146,11 +146,6 @@ dts := arch/mips/dts
 %.dtb: scripts
 	$(Q)$(MAKE) $(build)=$(dts) $(dts)/$@
 
-dtbs: scripts
-	$(Q)$(MAKE) $(build)=$(dts) dtbs
-
-KBUILD_DTBS := dtbs
-
 KBUILD_IMAGE ?= $(KBUILD_BINARY)
 
 #####
diff --git a/arch/mips/dts/Makefile b/arch/mips/dts/Makefile
index 348b814..7ccb2f8 100644
--- a/arch/mips/dts/Makefile
+++ b/arch/mips/dts/Makefile
@@ -4,9 +4,12 @@ obj-$(CONFIG_BUILTIN_DTB) += $(BUILTIN_DTB).dtb.o
 
 dtb-y += ${BUILTIN_DTB}.dtb
 
+.SECONDARY: $(obj)/$(BUILTIN_DTB).dtb.S
+.SECONDARY: $(patsubst %,$(obj)/%.S,$(dtb-y))
+
 targets += dtbs
 targets += $(dtb-y)
 
-dtbs: $(addprefix $(obj)/, $(dtb-y))
+extra-y += $(dtb-y)
 
 clean-files := *.dtb *.dtb.S
-- 
2.0.0.rc2




More information about the barebox mailing list