Skip to contentSkip to conversation

rpi-base: fix make_dtb_boot_files() for raspberrypi3-64

PATCH Applied Andrea Galbusera 2 participants 4 messages Apr 21, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rpi-base: fix make_dtb_boot_files() for raspberrypi3-64

Building the stock wic image for raspberrypi3-64 failed to find dtbs listed in IMAGE_BOOT_FILES. This patch updates the make_dtb_boot_files() function to account for dtbs listed in KERNEL_DEVICETREE that do include a path prefix:
this is the case for things like broadcom/bcm2710-rpi-3-b.dtb (the dts dir layout in the kernel sources is different for arm64). Use the same approach already used for overlays/ dir. While at it also fix a typo in dtb overlay code path comments.

---
 conf/machine/include/rpi-base.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
conf/machine/include/rpi-base.inc +5 -4
index 517d5ba..4a0ea2a 100644
@@ -61,16 +61,17 @@ def make_dtb_boot_files(d):
 
     def transform(dtb):
         if dtb.endswith('dtb'):
-            # eg: bcm2708-rpi-b.dtb has:
+            # eg: whatever/bcm2708-rpi-b.dtb has:
             #     DEPLOYDIR file: ${KERNEL_IMAGETYPE}-bcm2708-rpi-b.dtb
             #     destination: bcm2708-rpi-b.dtb
-            src = '{}-{}'.format(imgtyp, dtb)
-            dst = dtb
+            base = os.path.basename(dtb)
+            src = '{}-{}'.format(imgtyp, base)
+            dst = base
             return '{};{}'.format(src, dst)
         elif dtb.endswith('dtbo'):
             # overlay dtb:
             # eg: overlays/hifiberry-amp.dtbo has:
-            #     DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbp
+            #     DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbo
             #     destination: overlays/hifiberry-amp.dtbo
             base = os.path.basename(dtb)
             src = '{}-{}'.format(imgtyp, base)
Signature · 1 line
2.7.4
#1 lore raw
Quoted 26 lines · Andrea Galbusera

Building the stock wic image for raspberrypi3-64 failed to find dtbs listed in IMAGE_BOOT_FILES. This patch updates the make_dtb_boot_files() function to account for dtbs listed in KERNEL_DEVICETREE that do include a path prefix:
this is the case for things like broadcom/bcm2710-rpi-3-b.dtb (the dts dir layout in the kernel sources is different for arm64). Use the same approach already used for overlays/ dir. While at it also fix a typo in dtb overlay code path comments.

---
 conf/machine/include/rpi-base.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
conf/machine/include/rpi-base.inc +1 -2
index 517d5ba..4a0ea2a 100644
@@ -61,16 +61,17 @@ def make_dtb_boot_files(d):
 
     def transform(dtb):
         if dtb.endswith('dtb'):
-            # eg: bcm2708-rpi-b.dtb has:
+            # eg: whatever/bcm2708-rpi-b.dtb has:
             #     DEPLOYDIR file: ${KERNEL_IMAGETYPE}-bcm2708-rpi-b.dtb
             #     destination: bcm2708-rpi-b.dtb
-            src = '{}-{}'.format(imgtyp, dtb)

conf/machine/include/rpi-base.inc def make_dtb_boot_files(d): · line 74

Quoted 10 lines
conf/machine/include/rpi-base.inc +4 -2
-            dst = dtb
+            base = os.path.basename(dtb)
+            src = '{}-{}'.format(imgtyp, base)
+            dst = base
             return '{};{}'.format(src, dst)
         elif dtb.endswith('dtbo'):
             # overlay dtb:
             # eg: overlays/hifiberry-amp.dtbo has:
-            #     DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbp
+            #     DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbo

Looks good to me but this seems like a typo.

--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan

#2 lore raw
Quoted 31 lines · Andrei Gherzan
Quoted 30 lines · Andrea Galbusera

Building the stock wic image for raspberrypi3-64 failed to find dtbs listed in IMAGE_BOOT_FILES. This patch updates the make_dtb_boot_files() function to account for dtbs listed in KERNEL_DEVICETREE that do include a path prefix:
this is the case for things like broadcom/bcm2710-rpi-3-b.dtb (the dts dir layout in the kernel sources is different for arm64). Use the same approach already used for overlays/ dir. While at it also fix a typo in dtb overlay code path comments.

---
 conf/machine/include/rpi-base.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
conf/machine/include/rpi-base.inc +4 -3
index 517d5ba..4a0ea2a 100644
@@ -61,16 +61,17 @@ def make_dtb_boot_files(d):
 
     def transform(dtb):
         if dtb.endswith('dtb'):
-            # eg: bcm2708-rpi-b.dtb has:
+            # eg: whatever/bcm2708-rpi-b.dtb has:
             #     DEPLOYDIR file: ${KERNEL_IMAGETYPE}-bcm2708-rpi-b.dtb
             #     destination: bcm2708-rpi-b.dtb
-            src = '{}-{}'.format(imgtyp, dtb)
-            dst = dtb
+            base = os.path.basename(dtb)
+            src = '{}-{}'.format(imgtyp, base)
+            dst = base
Quoted 8 lines

conf/machine/include/rpi-base.inc def make_dtb_boot_files(d): · line 74

Quoted 6 lines
conf/machine/include/rpi-base.inc +1 -1
             return '{};{}'.format(src, dst)
         elif dtb.endswith('dtbo'):
             # overlay dtb:
             # eg: overlays/hifiberry-amp.dtbo has:
-            #     DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbp
+            #     DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbo

Looks good to me but this seems like a typo.

Scratch that. Looks good all together.

--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan

#3 lore raw
In reply to Andrea Galbusera
Quoted 42 lines · Andrea Galbusera

Building the stock wic image for raspberrypi3-64 failed to find dtbs listed in IMAGE_BOOT_FILES. This patch updates the make_dtb_boot_files() function to account for dtbs listed in KERNEL_DEVICETREE that do include a path prefix:
this is the case for things like broadcom/bcm2710-rpi-3-b.dtb (the dts dir layout in the kernel sources is different for arm64). Use the same approach already used for overlays/ dir. While at it also fix a typo in dtb overlay code path comments.

---
 conf/machine/include/rpi-base.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
conf/machine/include/rpi-base.inc +5 -5
index 517d5ba..4a0ea2a 100644
@@ -61,16 +61,17 @@ def make_dtb_boot_files(d):
 
     def transform(dtb):
         if dtb.endswith('dtb'):
-            # eg: bcm2708-rpi-b.dtb has:
+            # eg: whatever/bcm2708-rpi-b.dtb has:
             #     DEPLOYDIR file: ${KERNEL_IMAGETYPE}-bcm2708-rpi-b.dtb
             #     destination: bcm2708-rpi-b.dtb
-            src = '{}-{}'.format(imgtyp, dtb)
-            dst = dtb
+            base = os.path.basename(dtb)
+            src = '{}-{}'.format(imgtyp, base)
+            dst = base
             return '{};{}'.format(src, dst)
         elif dtb.endswith('dtbo'):
             # overlay dtb:
             # eg: overlays/hifiberry-amp.dtbo has:
-            #     DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbp
+            #     DEPLOYDIR file: ${KERNEL_IMAGETYPE}-hifiberry-amp.dtbo
             #     destination: overlays/hifiberry-amp.dtbo
             base = os.path.basename(dtb)
             src = '{}-{}'.format(imgtyp, base)
--

2.7.4

Quoted 5 lines

--
_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

Merged to master. Thanks.

--
Andrei Gherzan
gpg: rsa4096/D4D94F67AD0E9640 | t: @agherzan