[1/2] ARM: dts: prevent *.dtb from always being rebuilt

Commit Message

Stephen Warren Dec. 29, 2012, 12:42 a.m. UTC

From: Stephen Warren <[e-mail]>

if_changed (used by the *.dts->*.dtc rule) rebuilds files if they aren't
contained in $(targets). (make V=2 indicates this). Add $(dtb-y) to
$(targets) to prevent *.dtb from always being rebuilt.

This fixes a regression introduced by the .dtb rule rework in 499cd82
"ARM: dt: change .dtb build rules to build in dts directory".

Reported-by: Shawn Guo <[e-mail]>
Signed-off-by: Stephen Warren <[e-mail]>
---
 arch/arm/boot/dts/Makefile |    1 +
 1 file changed, 1 insertion(+)

Comments

Olof Johansson Dec. 30, 2012, 5:32 a.m. UTC | #1

On Fri, Dec 28, 2012 at 05:42:46PM -0700, Stephen Warren wrote:
> From: Stephen Warren <[e-mail]>
> 
> if_changed (used by the *.dts->*.dtc rule) rebuilds files if they aren't
> contained in $(targets). (make V=2 indicates this). Add $(dtb-y) to
> $(targets) to prevent *.dtb from always being rebuilt.
> 
> This fixes a regression introduced by the .dtb rule rework in 499cd82
> "ARM: dt: change .dtb build rules to build in dts directory".
> 
> Reported-by: Shawn Guo <[e-mail]>
> Signed-off-by: Stephen Warren <[e-mail]>

Not sure who you have in mind to apply this, but if it's not through arm-soc:

Acked-by: Olof Johansson <[e-mail]>


-Olof

Stephen Warren Dec. 31, 2012, 4:39 p.m. UTC | #2

On 12/29/2012 10:32 PM, Olof Johansson wrote:
> On Fri, Dec 28, 2012 at 05:42:46PM -0700, Stephen Warren wrote:
>> From: Stephen Warren <[e-mail]>
>>
>> if_changed (used by the *.dts->*.dtc rule) rebuilds files if they aren't
>> contained in $(targets). (make V=2 indicates this). Add $(dtb-y) to
>> $(targets) to prevent *.dtb from always being rebuilt.
>>
>> This fixes a regression introduced by the .dtb rule rework in 499cd82
>> "ARM: dt: change .dtb build rules to build in dts directory".
>>
>> Reported-by: Shawn Guo <[e-mail]>
>> Signed-off-by: Stephen Warren <[e-mail]>
> 
> Not sure who you have in mind to apply this, but if it's not through arm-soc:
> 
> Acked-by: Olof Johansson <[e-mail]>

I was assuming through the device tree tree, since that's where the dtc
rule rework went through, but I think it's mostly just about whoever
picks it up:-)

Rob Herring Dec. 31, 2012, 5:24 p.m. UTC | #3

On 12/31/2012 10:39 AM, Stephen Warren wrote:
> On 12/29/2012 10:32 PM, Olof Johansson wrote:
>> On Fri, Dec 28, 2012 at 05:42:46PM -0700, Stephen Warren wrote:
>>> From: Stephen Warren <[e-mail]>
>>>
>>> if_changed (used by the *.dts->*.dtc rule) rebuilds files if they aren't
>>> contained in $(targets). (make V=2 indicates this). Add $(dtb-y) to
>>> $(targets) to prevent *.dtb from always being rebuilt.
>>>
>>> This fixes a regression introduced by the .dtb rule rework in 499cd82
>>> "ARM: dt: change .dtb build rules to build in dts directory".
>>>
>>> Reported-by: Shawn Guo <[e-mail]>
>>> Signed-off-by: Stephen Warren <[e-mail]>
>>
>> Not sure who you have in mind to apply this, but if it's not through arm-soc:
>>
>> Acked-by: Olof Johansson <[e-mail]>
> 
> I was assuming through the device tree tree, since that's where the dtc
> rule rework went through, but I think it's mostly just about whoever
> picks it up:-)
> 

I'll pick up both.

Rob

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e44da40..5ebb44f 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -155,6 +155,7 @@  dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
 dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb
 
 targets += dtbs
+targets += $(dtb-y)
 endif
 
 # *.dtb used to be generated in the directory above. Clean out the