2013-06-24 20:42:15

by Doug Anderson

Subject: [PATCH] ARM: 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 <[email protected]>
Signed-off-by: Doug Anderson <[email protected]>
---
arch/arm/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

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

--
1.8.3

2013-06-24 20:45:04

by Olof Johansson

Subject: Re: [PATCH] ARM: Fix dtb dependency to use order-only prerequisites

On Mon, Jun 24, 2013 at 1:41 PM, Doug Anderson <[email protected]> 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 <[email protected]>
> Signed-off-by: Doug Anderson <[email protected]>

Acked-by: Olof Johansson <[email protected]>

Please send to Russell's patch tracker.


-Olof

2013-06-24 20:55:28

by David Brown

Subject: Re: [PATCH] ARM: Fix dtb dependency to use order-only prerequisites

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 <[email protected]>
>Signed-off-by: Doug Anderson <[email protected]>
>---
> arch/arm/Makefile | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: David Brown <[email protected]>

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation