From ab7b1c6a09e7794cfc853ac6b97d72bca6695128 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 10 May 2024 01:09:00 +0200 Subject: [PATCH] bcm27xx-eeprom: update to v2024.04.20-2712 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This update contains multiple BCM2712 improvements and also some minor improvements for BCM2711. From now on, only the latest version from default will be copied. There are too many versions right now and the package can't be installed without expanding the rootfs if all versions are copied. Full changelog: https://github.com/raspberrypi/rpi-eeprom/compare/v.2024.01.05-2712...v2024.04.20-2712 Signed-off-by: Álvaro Fernández Rojas --- utils/bcm27xx-eeprom/Makefile | 17 ++++++++--------- ...rom-update-change-default-include-path.patch | 8 ++++---- ...update-chmod-silent-f-is-not-supported.patch | 4 ++-- ...fig-replace-nano-with-vi-as-default-ed.patch | 4 ++-- 4 files changed, 16 insertions(+), 17 deletions(-) diff --git a/utils/bcm27xx-eeprom/Makefile b/utils/bcm27xx-eeprom/Makefile index 2d2fac5c4a..ee8fe7b59d 100644 --- a/utils/bcm27xx-eeprom/Makefile +++ b/utils/bcm27xx-eeprom/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bcm27xx-eeprom -PKG_VERSION:=v.2024.01.05-2712 -PKG_RELEASE:=2 +PKG_VERSION:=v2024.04.20-2712 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/rpi-eeprom/tar.gz/$(PKG_VERSION)? -PKG_HASH:=ae1d9f10e4383ee39b291b4b3be1be583f6f32f806f65a1431da65ca4ccffe39 +PKG_HASH:=83ea92e64d9a620376ef081d69f3cdde5a8b376b4a56aeb685f8a56dd10e7b14 PKG_LICENSE:=BSD-3-Clause Custom PKG_LICENSE_FILES:=LICENSE @@ -74,21 +74,20 @@ endef define Package/bcm2711-eeprom/install $(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2711 $(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2711/default - $(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2711/latest $(CP) $(PKG_BUILD_DIR)/firmware-2711/release-notes.md $(1)/lib/firmware/raspberrypi/bootloader-2711 - $(CP) $(PKG_BUILD_DIR)/firmware-2711/default $(1)/lib/firmware/raspberrypi/bootloader-2711 - $(CP) $(PKG_BUILD_DIR)/firmware-2711/latest $(1)/lib/firmware/raspberrypi/bootloader-2711 + $(CP) $(PKG_BUILD_DIR)/firmware-2711/default/pieeprom-2024-04-15.bin $(1)/lib/firmware/raspberrypi/bootloader-2711/default + $(CP) $(PKG_BUILD_DIR)/firmware-2711/default/recovery.bin $(1)/lib/firmware/raspberrypi/bootloader-2711/default + $(CP) $(PKG_BUILD_DIR)/firmware-2711/default/vl805-000138c0.bin $(1)/lib/firmware/raspberrypi/bootloader-2711/default endef define Package/bcm2712-eeprom/install $(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2712 $(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2712/default - $(INSTALL_DIR) $(1)/lib/firmware/raspberrypi/bootloader-2712/latest $(CP) $(PKG_BUILD_DIR)/firmware-2712/release-notes.md $(1)/lib/firmware/raspberrypi/bootloader-2712 - $(CP) $(PKG_BUILD_DIR)/firmware-2712/default $(1)/lib/firmware/raspberrypi/bootloader-2712 - $(CP) $(PKG_BUILD_DIR)/firmware-2712/latest $(1)/lib/firmware/raspberrypi/bootloader-2712 + $(CP) $(PKG_BUILD_DIR)/firmware-2712/default/pieeprom-2024-04-20.bin $(1)/lib/firmware/raspberrypi/bootloader-2712/default + $(CP) $(PKG_BUILD_DIR)/firmware-2712/default/recovery.bin $(1)/lib/firmware/raspberrypi/bootloader-2712/default endef $(eval $(call BuildPackage,bcm27xx-eeprom)) diff --git a/utils/bcm27xx-eeprom/patches/0002-rpi-eeprom-update-change-default-include-path.patch b/utils/bcm27xx-eeprom/patches/0002-rpi-eeprom-update-change-default-include-path.patch index 840cd286fc..25a48e48b2 100644 --- a/utils/bcm27xx-eeprom/patches/0002-rpi-eeprom-update-change-default-include-path.patch +++ b/utils/bcm27xx-eeprom/patches/0002-rpi-eeprom-update-change-default-include-path.patch @@ -24,7 +24,7 @@ Signed-off-by: Álvaro Fernández Rojas fi LOCAL_MODE=0 -@@ -423,7 +423,7 @@ checkDependencies() { +@@ -436,7 +436,7 @@ checkDependencies() { echo "Run with -h for more information." echo echo "To enable flashrom programming of the EEPROM" @@ -33,7 +33,7 @@ Signed-off-by: Álvaro Fernández Rojas echo "RPI_EEPROM_USE_FLASHROM=1" echo "CM4_ENABLE_RPI_EEPROM_UPDATE=1" echo -@@ -514,7 +514,7 @@ The system should then boot normally. +@@ -523,7 +523,7 @@ The system should then boot normally. If /boot does not correspond to the boot partition and this is not a NOOBS system, then the mount point for BOOTFS should be defined @@ -42,7 +42,7 @@ Signed-off-by: Álvaro Fernández Rojas A backup of the current EEPROM config file is written to ${FIRMWARE_BACKUP_DIR} before applying the update. -@@ -546,7 +546,7 @@ Options: +@@ -555,7 +555,7 @@ Options: -u Install the specified VL805 (USB EEPROM) image file. Environment: @@ -51,7 +51,7 @@ Signed-off-by: Álvaro Fernández Rojas EEPROM_CONFIG_HOOK -@@ -618,7 +618,7 @@ must first be enabled by removing ENABLE +@@ -627,7 +627,7 @@ must first be enabled by removing ENABLE via usbboot. After enabling self-update set the CM4_ENABLE_RPI_EEPROM_UPDATE=1 environment diff --git a/utils/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-chmod-silent-f-is-not-supported.patch b/utils/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-chmod-silent-f-is-not-supported.patch index 344d001d86..0999eb9bff 100644 --- a/utils/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-chmod-silent-f-is-not-supported.patch +++ b/utils/bcm27xx-eeprom/patches/0003-rpi-eeprom-update-chmod-silent-f-is-not-supported.patch @@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/rpi-eeprom-update +++ b/rpi-eeprom-update -@@ -216,7 +216,7 @@ applyRecoveryUpdate() +@@ -220,7 +220,7 @@ applyRecoveryUpdate() || die "Failed to copy ${TMP_EEPROM_IMAGE} to ${BOOTFS}" # For NFS mounts ensure that the files are readable to the TFTP user @@ -22,7 +22,7 @@ Signed-off-by: Álvaro Fernández Rojas || die "Failed to set permissions on eeprom update files" fi -@@ -227,7 +227,7 @@ applyRecoveryUpdate() +@@ -231,7 +231,7 @@ applyRecoveryUpdate() || die "Failed to copy ${VL805_UPDATE_IMAGE} to ${BOOTFS}/vl805.bin" # For NFS mounts ensure that the files are readable to the TFTP user diff --git a/utils/bcm27xx-eeprom/patches/0004-rpi-eeprom-config-replace-nano-with-vi-as-default-ed.patch b/utils/bcm27xx-eeprom/patches/0004-rpi-eeprom-config-replace-nano-with-vi-as-default-ed.patch index 3cbdd71621..27543f6ac3 100644 --- a/utils/bcm27xx-eeprom/patches/0004-rpi-eeprom-config-replace-nano-with-vi-as-default-ed.patch +++ b/utils/bcm27xx-eeprom/patches/0004-rpi-eeprom-config-replace-nano-with-vi-as-default-ed.patch @@ -13,7 +13,7 @@ Signed-off-by: Álvaro Fernández Rojas --- a/rpi-eeprom-config +++ b/rpi-eeprom-config -@@ -184,8 +184,8 @@ def edit_config(eeprom=None): +@@ -186,8 +186,8 @@ def edit_config(eeprom=None): """ Implements something like 'git commit' for editing EEPROM configs. """ @@ -24,7 +24,7 @@ Signed-off-by: Álvaro Fernández Rojas if 'EDITOR' in os.environ: editor = os.environ['EDITOR'] -@@ -484,7 +484,7 @@ Operating modes: +@@ -517,7 +517,7 @@ Operating modes: To cancel the pending update run 'sudo rpi-eeprom-update -r' -- 2.30.2