Skip to contentSkip to conversation

configs/raspberrypi0w: fix dts file name after kernel bump

PATCH New Peter Korsgaard 2 participants 3 messages Sep 14, 2019 – Sep 15, 2019 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 configs/raspberrypi0w: fix dts file name after kernel bump

Fixes #12816

Commit 42d22f3bdba41da ({configs/raspberrypi,package/rpi-firmware}: bump kernel/firmware to 20190819 version) updated the kernel version but failed to take into consideration that the rpi0w dts file has been renamed:

https://github.com/raspberrypi/linux/commit/6f91b5dbfdb62a434571a73f2dc15181963e3bea

Fix it by renaming the dts/dtb file referenced from the kernel build and genimage.

---
 board/raspberrypi/genimage-raspberrypi0w.cfg | 2 +-
 configs/raspberrypi0w_defconfig              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
board/raspberrypi/genimage-raspberrypi0w.cfg +1 -1
index 3aafd9b6fc..f76256ef8a 100644
@@ -1,7 +1,7 @@
 image boot.vfat {
   vfat {
     files = {
-      "bcm2708-rpi-0-w.dtb",
+      "bcm2708-rpi-zero-w.dtb",
       "rpi-firmware/bootcode.bin",
       "rpi-firmware/cmdline.txt",
       "rpi-firmware/config.txt",
configs/raspberrypi0w_defconfig +1 -1
index 2a567cbb03..57276aa8f7 100644
@@ -12,7 +12,7 @@ BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,raspberrypi,linux,raspberrypi-kernel_1.20190819-1)/linux-raspberrypi-kernel_1.20190819-1.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 
 BR2_PACKAGE_RPI_FIRMWARE=y
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/2 configs/raspberrypi0: use dedicated rpi0 dts file

Since the bump to the 20190819 snapshot there is now a dedicated dts file for the rpi0, so use that rather than the rpi-b-plus one:

https://github.com/raspberrypi/linux/commit/bd1336d8b6544ce5c7ddb197c3d8c539082dac66

---
 board/raspberrypi/genimage-raspberrypi0.cfg | 2 +-
 configs/raspberrypi0_defconfig              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
board/raspberrypi/genimage-raspberrypi0.cfg +1 -1
index a9d4c4501f..f21a52f31e 100644
@@ -1,7 +1,7 @@
 image boot.vfat {
   vfat {
     files = {
-      "bcm2708-rpi-b-plus.dtb",
+      "bcm2708-rpi-zero.dtb",
       "rpi-firmware/bootcode.bin",
       "rpi-firmware/cmdline.txt",
       "rpi-firmware/config.txt",
configs/raspberrypi0_defconfig +1 -1
index 6c0dd20f6e..7255f8d067 100644
@@ -15,7 +15,7 @@ BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
 # Build the DTBs for A/B from the kernel sources: the zero is the same
 # as the A+ model, just in a different form-factor
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-b-plus"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero"
 
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 
Signature · 1 line
2.20.1
#2 lore raw

PATCH 1/2 configs/raspberrypi0w: fix dts file name after kernel bump

In reply to Peter Korsgaard
Quoted 8 lines · On Sat, 14 Sep 2019 14:05:28 +0200 Peter Korsgaard <[email protected]> wrote:

Fixes #12816

Commit 42d22f3bdba41da ({configs/raspberrypi,package/rpi-firmware}: bump kernel/firmware to 20190819 version) updated the kernel version but failed to take into consideration that the rpi0w dts file has been renamed:

https://github.com/raspberrypi/linux/commit/6f91b5dbfdb62a434571a73f2dc15181963e3bea

Quoted 8 lines

Fix it by renaming the dts/dtb file referenced from the kernel build and genimage.

---
 board/raspberrypi/genimage-raspberrypi0w.cfg | 2 +-
 configs/raspberrypi0w_defconfig              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Both applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com