aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorDouglas Anderson <dianders@chromium.org>2013-06-24 17:03:50 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-06-29 06:20:22 -0400
commit81793bab5d7cc0d0962dae47dab3a63ae4bd5265 (patch)
treeabca8d192ec868023d358f9d68695795cfe79cb8 /arch/arm/Makefile
parent52c08a9e399739979027ea1e463f5529476da104 (diff)
ARM: 7774/1: Fix dtb dependency to use order-only prerequisites
The %.dtb dependency is specified to depend on the PHONY "scripts". That means that it'll build every time even if the underlying dtb file hasn't been touched. Use an order-only prerequisites to fix this. Also mark "dtbs" as PHONY for correctness. This was broken in (70b0476 ARM: 7513/1: Make sure dtc is built before running it). Reported-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Doug Anderson <dianders@chromium.org> Acked-by: Olof Johansson <olof@lixom.net> Reviewed-by: David Brown <davidb@codeaurora.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 47374085befd..10c08092378f 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -289,9 +289,10 @@ zImage Image xipImage bootpImage uImage: vmlinux
289zinstall uinstall install: vmlinux 289zinstall uinstall install: vmlinux
290 $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@ 290 $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
291 291
292%.dtb: scripts 292%.dtb: | scripts
293 $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@ 293 $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
294 294
295PHONY += dtbs
295dtbs: scripts 296dtbs: scripts
296 $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs 297 $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs
297 298