summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-06-11 08:31:58 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-06-11 08:48:39 +0200
commit40a1897e885c238697ff65610ea4c2772fd9b634 (patch)
tree825d5f630280ca7fe459a951b068590b7fc9798f
parent8e89bc594a8fbc3337a08c2c4ac03519000e89b7 (diff)
downloadbarebox-40a1897e885c238697ff65610ea4c2772fd9b634.tar.gz
barebox-40a1897e885c238697ff65610ea4c2772fd9b634.tar.xz
mips: Fix dtb build rules
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@pengutronix.de>
-rw-r--r--arch/mips/Makefile5
-rw-r--r--arch/mips/dts/Makefile5
2 files changed, 4 insertions, 6 deletions
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index b3bacf3be1..a3cf112b79 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 348b81426b..7ccb2f811c 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