From 40a1897e885c238697ff65610ea4c2772fd9b634 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Wed, 11 Jun 2014 08:31:58 +0200 Subject: 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 --- arch/mips/Makefile | 5 ----- arch/mips/dts/Makefile | 5 ++++- 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'arch/mips') 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 -- cgit v1.2.3