Merge remote-tracking branch 'pitowers/master' into debian/bookworm

* pitowers/master:
  2025-01-22: 2712: Promote 2025-01-22 to default release (default)
  pieeprom-2025-01-22: 2712: Add DT property for hash of signed boot image (latest)
  test: Update test script
  scripts: Failover to /usr/lib before /lib if FIRMWARE_ROOT is not set
This commit is contained in:
Tim Gover
2025-01-22 10:28:37 +00:00
8 changed files with 22 additions and 8 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,5 +1,17 @@
# Raspberry Pi5 bootloader EEPROM release notes # Raspberry Pi5 bootloader EEPROM release notes
## 2025-01-22: Promote 2025-01-22 to default release (default)
## 2025-01-22: Add DT /chosen property signed-boot boot.img hash (latest)
* Add DT /chosen property signed-boot boot.img hash
Make the sha256 hash of the boot.img file available via
device-tree /proc/device-tree/chosen/bootloader/boot_img_sha256 if
signed boot is enabled.
* filesystem: GPT autoboot/reboot partition number fixes for Pi4 and older
* Fix problems when setting arm_freq_min=arm_freq and display clocks
if performance governor is not enabled.
## 2025-01-14: Add set_reboot_order API (latest) ## 2025-01-14: Add set_reboot_order API (latest)
* Add set_reboot_order API and config.txt properties * Add set_reboot_order API and config.txt properties

View File

@@ -14,6 +14,8 @@ LOCAL_MODE=0
if [ -n "$FIRMWARE_ROOT" ]; then if [ -n "$FIRMWARE_ROOT" ]; then
# Provided by environment # Provided by environment
true true
elif [ -d /usr/lib/firmware/raspberrypi/bootloader ] || [ -d /usr/lib/firmware/raspberrypi/bootloader-2711 ] || [ -d /usr/lib/firmware/raspberrypi/bootloader-2712 ]; then
FIRMWARE_ROOT=/usr/lib/firmware/raspberrypi/bootloader
elif [ -d /lib/firmware/raspberrypi/bootloader ] || [ -d /lib/firmware/raspberrypi/bootloader-2711 ] || [ -d /lib/firmware/raspberrypi/bootloader-2712 ]; then elif [ -d /lib/firmware/raspberrypi/bootloader ] || [ -d /lib/firmware/raspberrypi/bootloader-2711 ] || [ -d /lib/firmware/raspberrypi/bootloader-2712 ]; then
FIRMWARE_ROOT=/lib/firmware/raspberrypi/bootloader FIRMWARE_ROOT=/lib/firmware/raspberrypi/bootloader
else else

View File

@@ -1,5 +1,5 @@
FIRMWARE_ROOT=/lib/firmware/raspberrypi/bootloader FIRMWARE_ROOT=/usr/lib/firmware/raspberrypi/bootloader
FIRMWARE_RELEASE_STATUS="default" FIRMWARE_RELEASE_STATUS="default"
FIRMWARE_BACKUP_DIR="/var/lib/raspberrypi/bootloader/backup" FIRMWARE_BACKUP_DIR="/var/lib/raspberrypi/bootloader/backup"
EEPROM_CONFIG_HOOK= EEPROM_CONFIG_HOOK=

View File

@@ -20,14 +20,14 @@ CONFIG="/etc/default/rpi-eeprom-update"
[ "$(id -u)" = "0" ] || die "$0 Must be run as root - try 'sudo $0 [-b]'" [ "$(id -u)" = "0" ] || die "$0 Must be run as root - try 'sudo $0 [-b]'"
# Clear out the old firmware # Clear out the old firmware
rm -rf /lib/firmware/raspberrypi/bootloader rm -rf /usr/lib/firmware/raspberrypi/bootloader
rm -rf /lib/firmware/raspberrypi/bootloader-2711 rm -rf /usr/lib/firmware/raspberrypi/bootloader-2711
rm -rf /lib/firmware/raspberrypi/bootloader-2712 rm -rf /usr/lib/firmware/raspberrypi/bootloader-2712
mkdir -p /lib/firmware/raspberrypi/bootloader-2711 mkdir -p /usr/lib/firmware/raspberrypi/bootloader-2711
rsync -alv "${FIRMWARE_DIR}-2711"/* /lib/firmware/raspberrypi/bootloader-2711 || echo "Failed" rsync -alv "${FIRMWARE_DIR}-2711"/* /usr/lib/firmware/raspberrypi/bootloader-2711 || echo "Failed"
mkdir -p /lib/firmware/raspberrypi/bootloader-2712 mkdir -p /usr/lib/firmware/raspberrypi/bootloader-2712
rsync -alv "${FIRMWARE_DIR}-2712"/* /lib/firmware/raspberrypi/bootloader-2712 || echo "Failed" rsync -alv "${FIRMWARE_DIR}-2712"/* /usr/lib/firmware/raspberrypi/bootloader-2712 || echo "Failed"
cp -fv "${script_dir}/../rpi-eeprom-config" /usr/bin cp -fv "${script_dir}/../rpi-eeprom-config" /usr/bin
cp -fv "${script_dir}/../rpi-eeprom-digest" /usr/bin cp -fv "${script_dir}/../rpi-eeprom-digest" /usr/bin