Skip to contentSkip to conversation

ARM build infra changes to support building .dtbos

PATCH Superseded Tero Kristo 3 participants 17 messages Aug 31, 2018 – Sep 6, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v2 cover ARM build infra changes to support building .dtbos

Hi,

This v2 is just a split of the v1 series, adding support for building DT overlays to ARM build infra. The series also adds support for individual Makefiles under boot/dts hierarchy, so that per-dir flags or rules can be introduced (patch #2, #4.)

Depends on the kbuild change for adding support for building .dtbo files [1].

[1] https://marc.info/?l=linux-arm-kernel&m=153571933518229&w=2

-Tero

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

#1 lore raw

PATCH v2 1/4 ARM: dts: add support for building DT overlays

Add simple support for building DT overlays. This just compiles any given .dtso file under the base arch/arm/boot/dts directory into a .dtbo.

---
 arch/arm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/Makefile +1 -1
index d1516f8..ab555a0 100644
@@ -339,7 +339,7 @@ $(BOOT_TARGETS): vmlinux
 $(INSTALL_TARGETS):
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
-%.dtb: | scripts
+%.dtb %.dtbo: | scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
Signature · 4 lines
1.9.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
#2 lore raw

PATCH v2 2/4 ARM: dts: add support for individual build flags for DT subdirs

In reply to Tero Kristo

Currently the makefile is setup in such manner that even if we build a DT file in a subdirectory under arch/arm/boot/dts, it gets built based on the base boot/dts/Makefile rules. This patch modifies the base makefile in such manner, that it detects which makefile to use based on build target path. This allows setting for example per-directory DTC_FLAGS and using those for the subdir build. The dtbdir local variable is setup to target to the build path.

---
 arch/arm/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/Makefile +3 -1
index ab555a0..b7c21e8 100644
@@ -339,8 +339,10 @@ $(BOOT_TARGETS): vmlinux
 $(INSTALL_TARGETS):
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
+%.dtb %.dtbo: dtbdir = $(patsubst %/,%,$(patsubst %./,%,$(boot)/dts/$(dir $@)))
+
 %.dtb %.dtbo: | scripts
-	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
+	$(Q)$(MAKE) $(build)=$(dtbdir) MACHINE=$(MACHINE) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
 
Signature · 4 lines
1.9.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
#3 lore raw

PATCH v2 3/4 arm64: dts: add support for building DT overlays

In reply to Tero Kristo

Add simple support for building DT overlays. This just compiles any given .dtso file under the base arch/arm64/boot/dts/*/ directory into a .dtbo.

---
 arch/arm64/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/Makefile +1 -1
index 106039d..f04c814 100644
@@ -127,7 +127,7 @@ Image.%: Image
 zinstall install:
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
-%.dtb: scripts
+%.dtb %.dtbo: scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
Signature · 4 lines
1.9.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
#4 lore raw

PATCH v2 4/4 arm64: dts: add support for per sub-dir makefiles for DT building

In reply to Tero Kristo

Currently the makefile for arm64 builds all the DT files based on rules in the arch/arm64/boot/dts/Makefile, as this is statically passed via the $(build)= parameter. Change the $(build) parameter to actually point to the subdir itself, so the makefile from that subdir can be used to set-up build flags etc., for example setting up DTC_FLAGS. The patsubst magic is used to strip the trailing "/" from the path, as that confuses the kbuild system.

---
 arch/arm64/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/Makefile +1 -1
index f04c814..2ac4358 100644
@@ -128,7 +128,7 @@ zinstall install:
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
 %.dtb %.dtbo: scripts
-	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
+	$(Q)$(MAKE) $(build)=$(patsubst %/,%,$(boot)/dts/$(dir $@)) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
 
Signature · 4 lines
1.9.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
#5 lore raw

v2 cover ARM build infra changes to support building .dtbos

In reply to Tero Kristo

Hi,

This v2 is just a split of the v1 series, adding support for building DT overlays to ARM build infra. The series also adds support for individual Makefiles under boot/dts hierarchy, so that per-dir flags or rules can be introduced (patch #2, #4.)

Resending due to missing Frank from delivery of initial v2.

Depends on the kbuild change for adding support for building .dtbo files [1].

[1] https://marc.info/?l=linux-arm-kernel&m=153604732319790&w=2

-Tero

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

#6 lore raw

PATCH RESEND v2 1/4 ARM: dts: add support for building DT overlays

Add simple support for building DT overlays. This just compiles any given .dtso file under the base arch/arm/boot/dts directory into a .dtbo.

---
 arch/arm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/Makefile +1 -1
index d1516f8..ab555a0 100644
@@ -339,7 +339,7 @@ $(BOOT_TARGETS): vmlinux
 $(INSTALL_TARGETS):
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
-%.dtb: | scripts
+%.dtb %.dtbo: | scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
Signature · 4 lines
1.9.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
#7 lore raw

Re: [RESEND PATCHv2 1/4] ARM: dts: add support for building DT overlays

+cc: [email protected]

For context on the device-tree compiler list, this patch is for the Linux kernel.

Quoted 15 lines · Tero Kristo

Add simple support for building DT overlays. This just compiles any given .dtso file under the base arch/arm/boot/dts directory into a .dtbo.

---
 arch/arm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/Makefile +0 -0
index d1516f8..ab555a0 100644

arch/arm/Makefile $(BOOT_TARGETS): vmlinux · line 345

Quoted 8 lines
arch/arm/Makefile +1 -1
@@ -339,7 +339,7 @@ $(BOOT_TARGETS): vmlinux
 $(INSTALL_TARGETS):
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
-%.dtb: | scripts
+%.dtb %.dtbo: | scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install

The idea of adding knowledge of .dtso and .dtbo files to the dtc compiler, but that idea and the related patches have fallen by the wayside.

Current overlay sources and blobs are properly handled by dtc when they are .dts and .dtb files.

If the dtc compiler is updated with knowledge of .dtso and .dtbo then these changes would be needed. At the moment the distinction of a .dtso and .dtbo is a naming convention that provides a clue about the intended use of the file. But dtc does not know these file name extensions, requiring a specific flag to tell dtc to treat them as .dts or .dtb files. I think the negative outweighs the positive for this patch.

-Frank

#8 lore raw

Re: [RESEND PATCHv2 1/4] ARM: dts: add support for building DT overlays

Quoted 24 lines · Frank Rowand

+cc: [email protected]

For context on the device-tree compiler list, this patch is for the Linux kernel.

Quoted 17 lines · Tero Kristo

Add simple support for building DT overlays. This just compiles any given .dtso file under the base arch/arm/boot/dts directory into a .dtbo.

---
 arch/arm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/Makefile +0 -0
index d1516f8..ab555a0 100644
@@ -339,7 +339,7 @@ $(BOOT_TARGETS): vmlinux
 $(INSTALL_TARGETS):
      $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
Quoted 2 lines

arch/arm/Makefile $(BOOT_TARGETS): vmlinux · line 342

Quoted 2 lines
arch/arm/Makefile +1 -1
-%.dtb: | scripts
+%.dtb %.dtbo: | scripts

This will need to change with my rework of the DT build rules[1].

Quoted 12 lines

arch/arm/Makefile $(BOOT_TARGETS): vmlinux · line 345

Quoted 4 lines
arch/arm/Makefile +0 -0
      $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install

The idea of adding knowledge of .dtso and .dtbo files to the dtc compiler, but that idea and the related patches have fallen by the wayside.

Current overlay sources and blobs are properly handled by dtc when they are .dts and .dtb files.

Quoted 7 lines

If the dtc compiler is updated with knowledge of .dtso and .dtbo then these changes would be needed. At the moment the distinction of a .dtso and .dtbo is a naming convention that provides a clue about the intended use of the file. But dtc does not know these file name extensions, requiring a specific flag to tell dtc to treat them as .dts or .dtb files. I think the negative outweighs the positive for this patch.

I don't follow what you are proposing. We should decide on a convention though.

We shouldn't need .dtso because that is identified with the /plugin/ tag. Distinguishing overlay dtbs with .dtbo seems like a good idea though.

Rob

[1] https://lkml.org/lkml/2018/8/21/770

#9 lore raw

Re: [RESEND PATCHv2 1/4] ARM: dts: add support for building DT overlays

Quoted 50 lines · Rob Herring
Quoted 24 lines · Frank Rowand

+cc: [email protected]

For context on the device-tree compiler list, this patch is for the Linux kernel.

Quoted 17 lines · Tero Kristo

Add simple support for building DT overlays. This just compiles any given .dtso file under the base arch/arm/boot/dts directory into a .dtbo.

---
 arch/arm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/Makefile +0 -0
index d1516f8..ab555a0 100644
@@ -339,7 +339,7 @@ $(BOOT_TARGETS): vmlinux
 $(INSTALL_TARGETS):
      $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
Quoted 2 lines

arch/arm/Makefile $(BOOT_TARGETS): vmlinux · line 342

Quoted 2 lines
arch/arm/Makefile +1 -1
-%.dtb: | scripts
+%.dtb %.dtbo: | scripts

This will need to change with my rework of the DT build rules[1].

Quoted 12 lines

arch/arm/Makefile $(BOOT_TARGETS): vmlinux · line 345

Quoted 4 lines
arch/arm/Makefile +0 -0
      $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install

The idea of adding knowledge of .dtso and .dtbo files to the dtc compiler, but that idea and the related patches have fallen by the wayside.

Current overlay sources and blobs are properly handled by dtc when they are .dts and .dtb files.

Quoted 7 lines

If the dtc compiler is updated with knowledge of .dtso and .dtbo then these changes would be needed. At the moment the distinction of a .dtso and .dtbo is a naming convention that provides a clue about the intended use of the file. But dtc does not know these file name extensions, requiring a specific flag to tell dtc to treat them as .dts or .dtb files. I think the negative outweighs the positive for this patch.

Quoted 5 lines

I don't follow what you are proposing. We should decide on a convention though.

We shouldn't need .dtso because that is identified with the /plugin/ tag. Distinguishing overlay dtbs with .dtbo seems like a good idea though.

I noted technical reasons that using .dtbo has both good and bad aspects. I too at times just fall back to a "sounds good" or "sounds bad" type response (and will continue to do so in the future), but in this case please provide a somewhat stronger reasoning for using .dtbo since I stated that I feel the in technical balance the negatives outweigh the positives. If dtc adds knowledge of .dtbo my opinion of the balance will immediately reverse.

Quoted 5 lines

Rob

[1] https://lkml.org/lkml/2018/8/21/770

#10 lore raw

PATCH RESEND v2 2/4 ARM: dts: add support for individual build flags for DT subdirs

In reply to Tero Kristo

Currently the makefile is setup in such manner that even if we build a DT file in a subdirectory under arch/arm/boot/dts, it gets built based on the base boot/dts/Makefile rules. This patch modifies the base makefile in such manner, that it detects which makefile to use based on build target path. This allows setting for example per-directory DTC_FLAGS and using those for the subdir build. The dtbdir local variable is setup to target to the build path.

---
 arch/arm/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/Makefile +3 -1
index ab555a0..b7c21e8 100644
@@ -339,8 +339,10 @@ $(BOOT_TARGETS): vmlinux
 $(INSTALL_TARGETS):
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
+%.dtb %.dtbo: dtbdir = $(patsubst %/,%,$(patsubst %./,%,$(boot)/dts/$(dir $@)))
+
 %.dtb %.dtbo: | scripts
-	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
+	$(Q)$(MAKE) $(build)=$(dtbdir) MACHINE=$(MACHINE) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
 
Signature · 4 lines
1.9.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
#11 lore raw

PATCH RESEND v2 2/4 ARM: dts: add support for individual build flags for DT subdirs

Quoted 21 lines · Tero Kristo

Currently the makefile is setup in such manner that even if we build a DT file in a subdirectory under arch/arm/boot/dts, it gets built based on the base boot/dts/Makefile rules. This patch modifies the base makefile in such manner, that it detects which makefile to use based on build target path. This allows setting for example per-directory DTC_FLAGS and using those for the subdir build. The dtbdir local variable is setup to target to the build path.

---
 arch/arm/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/Makefile +0 -0
index ab555a0..b7c21e8 100644
@@ -339,8 +339,10 @@ $(BOOT_TARGETS): vmlinux
 $(INSTALL_TARGETS):

arch/arm/Makefile $(BOOT_TARGETS): vmlinux · line 348

Quoted 10 lines
arch/arm/Makefile +3 -1
 	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
+%.dtb %.dtbo: dtbdir = $(patsubst %/,%,$(patsubst %./,%,$(boot)/dts/$(dir $@)))
+
 %.dtb %.dtbo: | scripts
-	$(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
+	$(Q)$(MAKE) $(build)=$(dtbdir) MACHINE=$(MACHINE) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
 

The makefile magic to handle subdirectories below $(boot)/dts/ already works properly to have Makefiles in $(boot)/dts/, using the following rule in arch/arm64/Makefile:

%.dtb: scripts

        $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@

I don't understand why that works for arm64, but it should work the same way for arm. Or if arch/arm is missing another piece from arch/arm64 we should be consistent with however the make system specifies it in arch/arm64

#12 lore raw

PATCH RESEND v2 2/4 ARM: dts: add support for individual build flags for DT subdirs

Quoted 38 lines · Frank Rowand
Quoted 21 lines · Tero Kristo

Currently the makefile is setup in such manner that even if we build a DT file in a subdirectory under arch/arm/boot/dts, it gets built based on the base boot/dts/Makefile rules. This patch modifies the base makefile in such manner, that it detects which makefile to use based on build target path. This allows setting for example per-directory DTC_FLAGS and using those for the subdir build. The dtbdir local variable is setup to target to the build path.

---
 arch/arm/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm/Makefile +0 -0
index ab555a0..b7c21e8 100644
@@ -339,8 +339,10 @@ $(BOOT_TARGETS): vmlinux
 $(INSTALL_TARGETS):

arch/arm/Makefile $(BOOT_TARGETS): vmlinux · line 348

Quoted 10 lines
arch/arm/Makefile +3 -1
      $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
+%.dtb %.dtbo: dtbdir = $(patsubst %/,%,$(patsubst %./,%,$(boot)/dts/$(dir $@)))
+
 %.dtb %.dtbo: | scripts
-     $(Q)$(MAKE) $(build)=$(boot)/dts MACHINE=$(MACHINE) $(boot)/dts/$@
+     $(Q)$(MAKE) $(build)=$(dtbdir) MACHINE=$(MACHINE) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
 

The makefile magic to handle subdirectories below $(boot)/dts/ already works properly to have Makefiles in $(boot)/dts/, using the following rule in arch/arm64/Makefile:

Quoted 7 lines

%.dtb: scripts

        $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@

I don't understand why that works for arm64, but it should work the same way for arm. Or if arch/arm is missing another piece from arch/arm64 we should be consistent with however the make system specifies it in arch/arm64

It should just need a subdir-y for the sub-directory. The target is "subdir/some.dtb" though.

If we want to build specific directories, we should get the standard way of doing that to work: make arch/arm/boot/dts/subdir/

Rob

#13 lore raw

PATCH RESEND v2 3/4 arm64: dts: add support for building DT overlays

In reply to Tero Kristo

Add simple support for building DT overlays. This just compiles any given .dtso file under the base arch/arm64/boot/dts/*/ directory into a .dtbo.

---
 arch/arm64/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/Makefile +1 -1
index 106039d..f04c814 100644
@@ -127,7 +127,7 @@ Image.%: Image
 zinstall install:
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
-%.dtb: scripts
+%.dtb %.dtbo: scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
Signature · 4 lines
1.9.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
#14 lore raw

Re: [RESEND PATCHv2 3/4] arm64: dts: add support for building DT overlays

Quoted 15 lines · Tero Kristo

Add simple support for building DT overlays. This just compiles any given .dtso file under the base arch/arm64/boot/dts/*/ directory into a .dtbo.

---
 arch/arm64/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/Makefile +0 -0
index 106039d..f04c814 100644

arch/arm64/Makefile Image.%: Image · line 133

Quoted 8 lines
arch/arm64/Makefile +1 -1
@@ -127,7 +127,7 @@ Image.%: Image
 zinstall install:
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
-%.dtb: scripts
+%.dtb %.dtbo: scripts
 	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install

Same comments as for patch 1/4.

#15 lore raw

PATCH RESEND v2 4/4 arm64: dts: add support for per sub-dir makefiles for DT building

In reply to Tero Kristo

Currently the makefile for arm64 builds all the DT files based on rules in the arch/arm64/boot/dts/Makefile, as this is statically passed via the $(build)= parameter. Change the $(build) parameter to actually point to the subdir itself, so the makefile from that subdir can be used to set-up build flags etc., for example setting up DTC_FLAGS. The patsubst magic is used to strip the trailing "/" from the path, as that confuses the kbuild system.

---
 arch/arm64/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/Makefile +1 -1
index f04c814..2ac4358 100644
@@ -128,7 +128,7 @@ zinstall install:
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
 %.dtb %.dtbo: scripts
-	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
+	$(Q)$(MAKE) $(build)=$(patsubst %/,%,$(boot)/dts/$(dir $@)) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
 
Signature · 4 lines
1.9.1

--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki
#16 lore raw

PATCH RESEND v2 4/4 arm64: dts: add support for per sub-dir makefiles for DT building

Quoted 19 lines · Tero Kristo

Currently the makefile for arm64 builds all the DT files based on rules in the arch/arm64/boot/dts/Makefile, as this is statically passed via the $(build)= parameter. Change the $(build) parameter to actually point to the subdir itself, so the makefile from that subdir can be used to set-up build flags etc., for example setting up DTC_FLAGS. The patsubst magic is used to strip the trailing "/" from the path, as that confuses the kbuild system.

---
 arch/arm64/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/Makefile +0 -0
index f04c814..2ac4358 100644

arch/arm64/Makefile zinstall install: · line 134

Quoted 8 lines
arch/arm64/Makefile +1 -1
@@ -128,7 +128,7 @@ zinstall install:
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
 %.dtb %.dtbo: scripts
-	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
+	$(Q)$(MAKE) $(build)=$(patsubst %/,%,$(boot)/dts/$(dir $@)) $(boot)/dts/$@
 
 PHONY += dtbs dtbs_install
 

same comment as for patch 2/4