aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <peter@korsgaard.com>2019-09-14 14:05:28 +0200
committerThomas Petazzoni <thomas.petazzoni@bootlin.com>2019-09-15 14:54:14 +0200
commitfcecfb66d1fb749426306dbea50fdeb37d4706d8 (patch)
tree8f41ff9fb5713a0e2e0283744b5e3c60e05ad888
parent40af3a6661f8d85fef60b6de603e78700f4f86e6 (diff)
downloadbuildroot-fcecfb66d1fb749426306dbea50fdeb37d4706d8.tar.bz2
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. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--board/raspberrypi/genimage-raspberrypi0w.cfg2
-rw-r--r--configs/raspberrypi0w_defconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/board/raspberrypi/genimage-raspberrypi0w.cfg b/board/raspberrypi/genimage-raspberrypi0w.cfg
index 3aafd9b6fc..f76256ef8a 100644
--- a/board/raspberrypi/genimage-raspberrypi0w.cfg
+++ b/board/raspberrypi/genimage-raspberrypi0w.cfg
@@ -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",
diff --git a/configs/raspberrypi0w_defconfig b/configs/raspberrypi0w_defconfig
index 2a567cbb03..57276aa8f7 100644
--- a/configs/raspberrypi0w_defconfig
+++ b/configs/raspberrypi0w_defconfig
@@ -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