Merge branch 'master' into debian/bookworm

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -6,7 +6,7 @@ body:
     value: |
       **Is this the right place for my bug report?**
       
-      * This repository contains the Raspberry Pi 4, Pi400 and CM4 bootloader EEPROM images and installation scripts.      
+      * This repository contains the Raspberry Pi 5, Raspberry Pi 4, Pi400, CM4 and CM4-S bootloader EEPROM images and installation scripts.      
       * Please report boot issues for the earlier models at the GPU firmware repo [github.com/raspberrypi/firmware](https://github.com/raspberrypi/firmware).
       * Please report USB issues which occur after the OS has started at the Linux repo [github.com/raspberrypi/linux/](https://github.com/raspberrypi/linux/).
       * If you simply have a question, then [the Raspberry Pi forums](https://www.raspberrypi.org/forums) are the best place to ask it. 
@@ -39,10 +39,12 @@ body:
     description: On which device you are facing the bug?
     multiple: true
     options:
+      - Raspberry Pi 5
       - Raspberry Pi 4 Mod. B
       - Raspberry Pi 400
       - Raspberry Pi CM4
       - Raspberry Pi CM4 Lite
+      - Raspberry Pi CM4-S
       - Other
   validations:
     required: true
@@ -52,7 +54,7 @@ body:
   attributes:
     label: Bootloader configuration.
     description: |      
-      Copy and paste the results of `vcgencmd bootloader_config` or describe the failing configuration.
+      Copy and paste the results of `rpi-eeprom-config` or describe the failing configuration.
       
       * `rpi-eeprom-update` saves a backup of the previous bootloader configuration to `/var/lib/raspberrypi/bootloader/backup` before it schedules the update.
       * `rpi-eeprom-config pieeprom.upd` can be used to read the contents of an EEPROM image.

README.md

@@ -9,7 +9,7 @@ To reset the bootloader back to factory defaults use [Raspberry Pi Imager](https
 
 # Bootloader documentation
 * [Config.txt boot options](https://www.raspberrypi.com/documentation/computers/config_txt.html#boot-options)
-* [Bootloader EEPROM](https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-4-boot-eeprom)
+* [Bootloader EEPROM](https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-boot-eeprom)
-* [Bootloader configuration](https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-4-bootloader-configuration)
+* [Bootloader configuration](https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-bootloader-configuration)
 * [Updating the Compute Module 4 bootloader](https://www.raspberrypi.com/documentation/computers/compute-module.html#cm4bootloader)
 * [Releases and release notes](releases.md)

firmware-2712/release-notes.md

@@ -1,5 +1,14 @@
 # Raspberry Pi5 bootloader EEPROM release notes
 
+2024-01-08: Promote 2024-01-05 to default (automatic update)
+
+2024-01-05: Fix handling of FAT files without LFNs.
+* Fix issues with SFN entries sometimes being treated as LFNs
+  see https://github.com/raspberrypi/rpi-eeprom/issues/514
+* Add a dedicated message for "M.2 HAT" not being found instead of
+  the generic 'unsupported boot order' message when NVMe boot is
+  skipped.
+
 2023-12-17: Promote 2023-12-14 to default release
 * Bump to the default release now that the partition number fix is confirmed.
 

imager/make-imager-release

@@ -8,4 +8,4 @@ script_dir=$(cd "$(dirname "$0")" && pwd)
 ${script_dir}/make-release critical 2023-01-11 000138c0 "${script_dir}/2711-config" release-2711 rpi-boot-eeprom-recovery 2711
 
 # Pi5
-${script_dir}/make-release critical 2023-12-06 "" "${script_dir}/2712-config" release-2712 rpi-boot-eeprom-recovery 2712
+${script_dir}/make-release critical 2024-01-05 "" "${script_dir}/2712-config" release-2712 rpi-boot-eeprom-recovery 2712

rpi-eeprom-update

@@ -395,7 +395,7 @@ checkDependencies() {
    elif [ $(((0x$BOARD_INFO >> 12) & 15)) = 4 ]; then
       BCM_CHIP=2712
       EEPROM_SIZE=2097152
-      BOOTLOADER_AUTO_UPDATE_MIN_VERSION="${BOOTLOADER_AUTO_UPDATE_MIN_VERSION:-1697650217}"
+      BOOTLOADER_AUTO_UPDATE_MIN_VERSION="${BOOTLOADER_AUTO_UPDATE_MIN_VERSION:-1704470260}"
       SPIDEV=/dev/spidev10.0
    else
       chipNotSupported