Raspberry Pi firmware option updates

nerves-project · Dec 21, 2021 · 59b8a65 · 59b8a65
1 parent 8867c74
commit 59b8a65
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/fwup.conf b/fwup.conf
@@ -94,10 +94,10 @@ meta-misc = ${NERVES_FW_MISC}
 # This is important, since this is the order that they're written on a firmware
 # update due to the event driven nature of the update system.
 file-resource fixup.dat {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/fixup.dat"
+    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/fixup4x.dat"
 }
 file-resource start.elf {
-    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/start.elf"
+    host-path = "${NERVES_SYSTEM}/images/rpi-firmware/start4x.elf"
 }
 file-resource config.txt {
     host-path = "${NERVES_SYSTEM}/images/config.txt"

diff --git a/nerves_defconfig b/nerves_defconfig
@@ -47,9 +47,8 @@ BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D=y
 BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4=y
 BR2_PACKAGE_MESA3D_OPENGL_ES=y
 BR2_PACKAGE_RPI_FIRMWARE=y
-BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4=y
 BR2_PACKAGE_RPI_FIRMWARE_CUSTOM_VERSION="1.20211007"
-BR2_PACKAGE_RPI_FIRMWARE_X=y
+BR2_PACKAGE_RPI_FIRMWARE_VARIANT_PI4_X=y
 BR2_PACKAGE_PIGPIO=y
 # BR2_PACKAGE_RNG_TOOLS_JITTERENTROPY_LIBRARY is not set
 BR2_PACKAGE_RPI_USERLAND=y