From 645c2a1201d15493a6481e488134027bf7bfb7aa Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Fri, 20 Oct 2023 09:57:33 +0100 Subject: [PATCH 1/3] rpi-eeprom-update: 2712: Bump the min version to pieeprom-2023-10-18 --- firmware-2712/release-notes.md | 2 +- rpi-eeprom-update | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/firmware-2712/release-notes.md b/firmware-2712/release-notes.md index 94027bf..4cd0e43 100644 --- a/firmware-2712/release-notes.md +++ b/firmware-2712/release-notes.md @@ -1,6 +1,6 @@ # Raspberry Pi5 bootloader EEPROM release notes -2023-10-18: Display autodetect + HAT gpiomap (default + latest) +2023-10-18: Display autodetect + HAT gpiomap (default + latest) (automatic update) * Add support for HAT gpiomap for improved HAT compatibility. * Add I2C probe for DSI display auto detect diff --git a/rpi-eeprom-update b/rpi-eeprom-update index 5917eca..04e2b1a 100755 --- a/rpi-eeprom-update +++ b/rpi-eeprom-update @@ -340,7 +340,7 @@ checkDependencies() { BCM_CHIP=2712 EEPROM_SIZE=2097152 RPI_EEPROM_SELF_UPDATE=1 - BOOTLOADER_AUTO_UPDATE_MIN_VERSION="${BOOTLOADER_AUTO_UPDATE_MIN_VERSION:-1695896697}" + BOOTLOADER_AUTO_UPDATE_MIN_VERSION="${BOOTLOADER_AUTO_UPDATE_MIN_VERSION:-1697650217}" else chipNotSupported fi @@ -492,10 +492,10 @@ to be stable. default: The default bootloader image which supports all current models and hardware -revisions. -If a critical bug fix is required then the minimum default version number -(BOOTLOADER_AUTO_UPDATE_MIN_VERSION) in the rpi-eeprom package is updated -causing the bootloader to be automatically updated. +revisions. If there is an important bug fix or hardware change that could +affect most uses then the then BOOTLOADER_AUTO_UPDATE_MIN_VERSION is updated +causing the update to be applied the next time the rpi-eeprom APT package is +updated. latest: Contains new features, bug fixes and performance improvements. From ff81e998c536cb5245e97865a9917fe8aaa0e1a2 Mon Sep 17 00:00:00 2001 From: Andrew Scheller Date: Sat, 21 Oct 2023 10:44:26 +0100 Subject: [PATCH 2/3] rpi-eeprom-update: Fix typos in usage text --- rpi-eeprom-update | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpi-eeprom-update b/rpi-eeprom-update index 04e2b1a..2dcc3ab 100755 --- a/rpi-eeprom-update +++ b/rpi-eeprom-update @@ -493,7 +493,7 @@ to be stable. default: The default bootloader image which supports all current models and hardware revisions. If there is an important bug fix or hardware change that could -affect most uses then the then BOOTLOADER_AUTO_UPDATE_MIN_VERSION is updated +affect most users then the BOOTLOADER_AUTO_UPDATE_MIN_VERSION is updated causing the update to be applied the next time the rpi-eeprom APT package is updated. From 5ec5c003bacc73847aadad712aa1fbdace8f1c4e Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Sun, 22 Oct 2023 14:28:32 +0100 Subject: [PATCH 3/3] rpi-eeprom-update: Switch back to recovery.bin on Pi5 The Pi5 EEPROM is larger and can take longer to update which slightly increases the change of failure if the board power is disconnected across an update. Re-enable recovery.bin for SD updates for now. --- rpi-eeprom-update | 3 --- 1 file changed, 3 deletions(-) diff --git a/rpi-eeprom-update b/rpi-eeprom-update index 2dcc3ab..fffdc52 100755 --- a/rpi-eeprom-update +++ b/rpi-eeprom-update @@ -335,11 +335,8 @@ checkDependencies() { EEPROM_SIZE=524288 BOOTLOADER_AUTO_UPDATE_MIN_VERSION="${BOOTLOADER_AUTO_UPDATE_MIN_VERSION:-1599135103}" elif [ $(((0x$BOARD_INFO >> 12) & 15)) = 4 ]; then - # BCM2712 always supports self-update so recovery.bin is only used for RPi imager - # bootloader updated SD cards or with RPIBOOT. BCM_CHIP=2712 EEPROM_SIZE=2097152 - RPI_EEPROM_SELF_UPDATE=1 BOOTLOADER_AUTO_UPDATE_MIN_VERSION="${BOOTLOADER_AUTO_UPDATE_MIN_VERSION:-1697650217}" else chipNotSupported