Skip to contentSkip to conversation

board/raspberrypi: fix rpi4/rpi4-64 genimage config files

PATCH New Peter Seiderer 2 participants 2 messages Jul 14, 2020 – Jul 22, 2020 Broadcom BCM2711/BCM2835 Arm architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 board/raspberrypi: fix rpi4/rpi4-64 genimage config files

Since commit 'package/rpi-firmware: fix startup file names' ([1]) the start and fixup file names are normalized to start.elf/fixup.dat, adjust the rpi4 genimage config files accordingly.

Fixes:

ERROR: file(rpi-firmware/fixup4.dat): stat(.../images/rpi-firmware/fixup4.dat) failed: No such file or directory
ERROR: vfat(boot.vfat): could not setup rpi-firmware/fixup4.dat

[1] https://git.buildroot.net/buildroot/commit/?id=1bdc0334ff6273761b2e7fda730cdcc7e1f46862

---
 board/raspberrypi/genimage-raspberrypi4-64.cfg | 4 ++--
 board/raspberrypi/genimage-raspberrypi4.cfg    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
board/raspberrypi/genimage-raspberrypi4-64.cfg +2 -2
index 3c480e98f0..854e0c7e31 100644
@@ -4,8 +4,8 @@ image boot.vfat {
       "bcm2711-rpi-4-b.dtb",
       "rpi-firmware/cmdline.txt",
       "rpi-firmware/config.txt",
-      "rpi-firmware/fixup4.dat",
-      "rpi-firmware/start4.elf",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
       "rpi-firmware/overlays",
       "Image"
     }
board/raspberrypi/genimage-raspberrypi4.cfg +2 -2
index 4e4742f3ef..60e1f23bcc 100644
@@ -4,8 +4,8 @@ image boot.vfat {
       "bcm2711-rpi-4-b.dtb",
       "rpi-firmware/cmdline.txt",
       "rpi-firmware/config.txt",
-      "rpi-firmware/fixup4.dat",
-      "rpi-firmware/start4.elf",
+      "rpi-firmware/fixup.dat",
+      "rpi-firmware/start.elf",
       "rpi-firmware/overlays",
       "zImage"
     }
Signature · 1 line
2.27.0
#1 lore raw

PATCH 1/1 board/raspberrypi: fix rpi4/rpi4-64 genimage config files

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

Since commit 'package/rpi-firmware: fix startup file names' ([1]) the start and fixup file names are normalized to start.elf/fixup.dat, adjust the rpi4 genimage config files accordingly.

Quoted 8 lines

Fixes:

ERROR: file(rpi-firmware/fixup4.dat): stat(.../images/rpi-firmware/fixup4.dat) failed: No such file or directory
ERROR: vfat(boot.vfat): could not setup rpi-firmware/fixup4.dat

[1] https://git.buildroot.net/buildroot/commit/?id=1bdc0334ff6273761b2e7fda730cdcc7e1f46862

Committed to 2020.02.x and 2020.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard