diff mbox

ARM: Fix dtb dependency to use order-only prerequisites

Message ID 1372106517-19105-1-git-send-email-dianders@chromium.org (mailing list archive)
State New, archived
Headers show

Commit Message

Doug Anderson June 24, 2013, 8:41 p.m. UTC
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>
---
 arch/arm/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Olof Johansson June 24, 2013, 8:45 p.m. UTC | #1
On Mon, Jun 24, 2013 at 1:41 PM, Doug Anderson <dianders@chromium.org> wrote:
> 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>

Please send to Russell's patch tracker.


-Olof
David Brown June 24, 2013, 8:55 p.m. UTC | #2
On Mon, Jun 24, 2013 at 01:41:57PM -0700, Doug Anderson wrote:
>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>
>---
> arch/arm/Makefile | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: David Brown <davidb@codeaurora.org>
diff mbox

Patch

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 1ba358b..fe8144e 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -289,9 +289,10 @@  zImage Image xipImage bootpImage uImage: vmlinux
 zinstall uinstall install: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
-%.dtb: scripts
+%.dtb: | scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
 
+PHONY += dtbs
 dtbs: scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) dtbs