Skip to contentSkip to conversation

dts: force dtb recompilation

PATCH New Patrick Delaunay 3 participants 4 messages Mar 6, 2019 – Mar 11, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dts: force dtb recompilation

The dependency for .dtb = .dts is not enough in dts Makefile, as the dts files are dts pre-proprocessed (include dtsi files, as specific *-u-boot.dtsi).

For arm architecture, the dependency is correctly managed in makefile of arch/arm/dts with .cmd files, it is needed to execute make in this directory.

---
Issue see on stm32mp1 board

stm32mp157c-ed1.dts is included in stm32mp157c-ev1.dts and dependency is not correctly managed
(ev1 is not recompiled when ed1 is modified)

 dts/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
dts/Makefile +1 -2
index a7a6043..bcd611f 100644
@@ -17,7 +17,6 @@ ifneq ($(EXT_DTB),)
 DTB := $(EXT_DTB)
 else
 DTB := $(ARCH_PATH)/$(DEVICE_TREE).dtb
-dtb_depends += $(DTB:.dtb=.dts)
 endif
 
 $(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
@@ -28,7 +27,7 @@ $(obj)/dt.dtb: $(DTB) FORCE
 
 targets += dt.dtb dt-spl.dtb
 
-$(DTB): $(dtb_depends)
+$(DTB): $(dtb_depends) FORCE
 ifeq ($(EXT_DTB),)
 	$(Q)$(MAKE) $(build)=$(ARCH_PATH) $@
 endif
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 dts: force dtb recompilation

Quoted 33 lines · Patrick Delaunay

The dependency for .dtb = .dts is not enough in dts Makefile, as the dts files are dts pre-proprocessed (include dtsi files, as specific *-u-boot.dtsi).

For arm architecture, the dependency is correctly managed in makefile of arch/arm/dts with .cmd files, it is needed to execute make in this directory.

---
Issue see on stm32mp1 board

stm32mp157c-ed1.dts is included in stm32mp157c-ev1.dts and dependency is not correctly managed
(ev1 is not recompiled when ed1 is modified)

 dts/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
dts/Makefile +0 -1
index a7a6043..bcd611f 100644
@@ -17,7 +17,6 @@ ifneq ($(EXT_DTB),)
 DTB := $(EXT_DTB)
 else
 DTB := $(ARCH_PATH)/$(DEVICE_TREE).dtb
-dtb_depends += $(DTB:.dtb=.dts)
 endif
 
 $(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE

dts/Makefile $(obj)/dt.dtb: $(DTB) FORCE · line 33

Quoted 8 lines
dts/Makefile +1 -1
@@ -28,7 +27,7 @@ $(obj)/dt.dtb: $(DTB) FORCE
 
 targets += dt.dtb dt-spl.dtb
 
-$(DTB): $(dtb_depends)
+$(DTB): $(dtb_depends) FORCE
 ifeq ($(EXT_DTB),)
 	$(Q)$(MAKE) $(build)=$(ARCH_PATH) $@
 endif

Yamada-san, what do you think of this? And I'm grabbing
https://patchwork.ozlabs.org/patch/1052939/ shortly, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190308/42645dc6/attachment.sig>
#2 lore raw

PATCH 1/1 dts: force dtb recompilation

In reply to Patrick Delaunay

Hi Patrick,

Quoted 9 lines · Patrick Delaunay

The dependency for .dtb = .dts is not enough in dts Makefile, as the dts files are dts pre-proprocessed (include dtsi files, as specific *-u-boot.dtsi).

For arm architecture, the dependency is correctly managed in makefile of arch/arm/dts with .cmd files, it is needed to execute make in this directory.

Quoted 7 lines

---
Issue see on stm32mp1 board

stm32mp157c-ed1.dts is included in stm32mp157c-ev1.dts and dependency is not correctly managed
(ev1 is not recompiled when ed1 is modified)

Do you still see this issue?

I do not see the problem any more
because the following commit fixed it.

commit 2737dfe096b6c34654734a5a4dc5f4b4962c5617

Author: Stephen Warren <[email protected]>
Date:   Tue Feb 26 12:20:25 2019 -0700

kbuild: make arch-dtbs target PHONY

Could you test it on the latest git version?

Quoted 32 lines
 dts/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
dts/Makefile +1 -3
index a7a6043..bcd611f 100644
@@ -17,7 +17,6 @@ ifneq ($(EXT_DTB),)
 DTB := $(EXT_DTB)
 else
 DTB := $(ARCH_PATH)/$(DEVICE_TREE).dtb
-dtb_depends += $(DTB:.dtb=.dts)
 endif
 
 $(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE
@@ -28,7 +27,7 @@ $(obj)/dt.dtb: $(DTB) FORCE
 
 targets += dt.dtb dt-spl.dtb
 
-$(DTB): $(dtb_depends)
+$(DTB): $(dtb_depends) FORCE
 ifeq ($(EXT_DTB),)
        $(Q)$(MAKE) $(build)=$(ARCH_PATH) $@
 endif
--

2.7.4

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot

Signature · 2 lines
Best Regards
Masahiro Yamada
#3 lore raw

PATCH 1/1 dts: force dtb recompilation

Hi Masahiro,

Quoted 21 lines

From: Masahiro Yamada <[email protected]>
Sent: samedi 9 mars 2019 16:57

Hi Patrick,

Quoted 13 lines · Patrick Delaunay

The dependency for .dtb = .dts is not enough in dts Makefile, as the dts files are dts pre-proprocessed (include dtsi files, as specific *-u-boot.dtsi).

For arm architecture, the dependency is correctly managed in makefile of arch/arm/dts with .cmd files, it is needed to execute make in this directory.

---
Issue see on stm32mp1 board

Quoted 6 lines
Quoted 3 lines

stm32mp157c-ed1.dts is included in stm32mp157c-ev1.dts and dependency is not correctly managed
(ev1 is not recompiled when ed1 is modified)

Do you still see this issue?

In fact no: I don’t' see the issue anymore on v2019.04-rc3

I detect the issue on v2019.04-rc2...
but I don't check it again when I push my patch on the master branch top.

Quoted 12 lines

I do not see the problem any more
because the following commit fixed it.

commit 2737dfe096b6c34654734a5a4dc5f4b4962c5617

Author: Stephen Warren <[email protected]>
Date:   Tue Feb 26 12:20:25 2019 -0700

kbuild: make arch-dtbs target PHONY

Could you test it on the latest git version?

Tested on
- v2019.04-rc2 => reproduced
- v2019.04-rc3 => NOT reproduced
- v2019.04-rc2 + Stephen path => NOT reproduced

So you are right, the Stephen patch solve already my issue and my patch can be dropped.

Quoted 25 lines
Quoted 25 lines
 dts/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
dts/Makefile +0 -0
@@ -17,7 +17,6 @@ ifneq ($(EXT_DTB),)
 DTB := $(EXT_DTB)
 else
 DTB := $(ARCH_PATH)/$(DEVICE_TREE).dtb -dtb_depends +=

$(DTB:.dtb=.dts) endif

$(obj)/dt-spl.dtb: $(DTB) $(objtree)/tools/fdtgrep FORCE @@ -28,7
+27,7 @@ $(obj)/dt.dtb: $(DTB) FORCE

targets += dt.dtb dt-spl.dtb

-$(DTB): $(dtb_depends)
+$(DTB): $(dtb_depends) FORCE
ifeq ($(EXT_DTB),)

        $(Q)$(MAKE) $(build)=$(ARCH_PATH) $@  endif

--
2.7.4

Quoted 10 lines
Quoted 4 lines

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot

--
Best Regards
Masahiro Yamada

Regards
Patrick