Updated documentation links

Documentation anchor IDs had been changed as they aren't Pi 4 specific now.

.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 configuration](https://www.raspberrypi.com/documentation/computers/raspberry-pi.html#raspberry-pi-4-bootloader-configuration)
+* [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-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,43 @@
 # Raspberry Pi5 bootloader EEPROM release notes
 
+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.
+
+2023-12-14: Fix boot partition parameter (latest)
+* Fix an issue where the boot partition parameter in PM_RSTS was cleared
+  before being checked.
+  https://github.com/raspberrypi/firmware/issues/1853
+* Add a specific fatal error pattern for RP1 not found - 4 long - 3 short
+
+2023-12-12: Promote 2023-12-06 to default release.
+
+2023-12-06: Initialise DWC PHY (latest)
+
+* Initialise the DWC PHY to enable DWC host+peripheral support under Linux.
+  Requires https://github.com/raspberrypi/linux/commit/82069a7a02632aa60fa5c69415bf891ede7d6fd4
+* Force PWM on 3V3 supply if cameras or HATs are connected or if power_force_3v3_pwm=1 in config.txt
+  Resolves an image quality issue with the GS camera.
+* Add support for C(arm_min_freq) < 1500 MHz (must be at >= 200 MHz)
+* Manufacturing test updates for DVFS.
+
+2023-11-20: Auto-detect support for PCIe expansion HAT (default + latest)
+
+* Add autodetect support for PCIe expansion HATs
+* Add PCIE_PROBE=1 to the EEPROM config for custom PCIe exapansion
+  designs that do not support the upcoming HAT spec. This gives
+  similar behaviour to CM4 where PCIe x1 is enumerated to discover NVMe
+  devices.
+* Fix loading of multiple initramfs images that are not 32-bit aligned sizes
+  https://github.com/raspberrypi/firmware/issues/1843
+* Kernel load performance improvement - remove a memcpy
+
 2023-10-30: UPG watchdog support + SD reset fixes (default + latest)
 
 * Fix SDIO / WiFi clock-setup for BOOT_ORDER=0xf14

imager/2712-config/boot-conf-default.txt

@@ -1,4 +1,4 @@
 [all]
 BOOT_UART=1
-BOOT_ORDER=0xf41
+BOOT_ORDER=0xf461
 POWER_OFF_ON_HALT=0

imager/2712-config/boot-conf-sd.txt

@@ -1,4 +1,4 @@
 [all]
 BOOT_UART=1
-BOOT_ORDER=0xf41
+BOOT_ORDER=0xf461
 POWER_OFF_ON_HALT=0

imager/2712-config/boot-conf-usb.txt

@@ -1,5 +1,5 @@
 [all]
 BOOT_UART=1
-BOOT_ORDER=0xf14
+BOOT_ORDER=0xf146
 POWER_OFF_ON_HALT=0
 

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-10-18 "" "${script_dir}/2712-config" release-2712 rpi-boot-eeprom-recovery 2712
+${script_dir}/make-release critical 2023-12-06 "" "${script_dir}/2712-config" release-2712 rpi-boot-eeprom-recovery 2712

rpi-eeprom-update

@@ -19,6 +19,7 @@ elif [ -d /lib/firmware/raspberrypi/bootloader ] || [ -d /lib/firmware/raspberry
 else
    # Work from local git checkout
    LOCAL_MODE=1
+   IGNORE_DPKG_CHECKSUMS=1
    FIRMWARE_ROOT="${script_dir}/firmware"
 fi
 
@@ -364,7 +365,7 @@ getBootloaderUpdateVersion() {
 }
 
 chipNotSupported() {
-   echo "This tool only works with Raspberry Pi4 and Rapberry Pi5"
+   echo "Device does not a have a Raspberry Pi bootloader EEPROM (e.g. Pi 4 or Pi 5). Skipping bootloader update."
    exit ${EXIT_SUCCESS}
 }
 
@@ -449,11 +450,15 @@ checkDependencies() {
       die "lspci not found. Try installing the pciutils package."
    fi
 
+   if ! command -v strings > /dev/null; then
+      die "strings not found. Try installing the binutils package."
+   fi
+
    # vcgencmd bootloader_version is deprecated. Use device-tree if available to
    # reduce the number of dependencies on VCHI.
    if ! [ -f "${DT_BOOTLOADER_TS}" ]; then
       if ! command -v vcgencmd > /dev/null; then
-         die "vcgencmd not found. Try installing the libraspberrypi-bin package."
+         die "vcgencmd not found. Try installing the raspi-utils package."
       fi
    fi
 
@@ -472,7 +477,7 @@ checkDependencies() {
    fi
 
    if ! command -v sha256sum > /dev/null; then
-      die "sha256sum not found. Try installing the coreutilities package."
+      die "sha256sum not found. Try installing the coreutils package."
    fi
 
    if [ "${BCM_CHIP}" = 2711 ] && [ ! -f "${RECOVERY_BIN}" ]; then
@@ -529,7 +534,6 @@ Options:
       Ignores the FREEZE_VERSION flag in bootloader and is intended for manual
       firmware updates.
    -h Display help text and exit
-   -i Ignore package checksums - for rpi-eeprom developers.
    -j Write status information using JSON notation (requires -m option)
    -l Returns the full path to the latest available EEPROM image file according
       to the FIRMWARE_RELEASE_STATUS and FIRMWARE_IMAGE_DIR settings.
@@ -915,7 +919,8 @@ AUTO_UPDATE_VL805=0
 SILENT_UPDATE=0
 MACHINE_OUTPUT=""
 JSON_OUTPUT="no"
-IGNORE_DPKG_CHECKSUMS=${LOCAL_MODE}
+# Ignore dpkg checksums by default so that rpi-update can install new binaries into /lib/firmware
+IGNORE_DPKG_CHECKSUMS=${IGNORE_DPKG_CHECKSUMS:-1}
 PACKAGE_INFO_DIR="/var/lib/dpkg/info/"
 if [ ! -d "${PACKAGE_INFO_DIR}" ]; then
    IGNORE_DPKG_CHECKSUMS=1
@@ -945,7 +950,9 @@ while getopts A:abdhilf:m:ju:rs option; do
       ;;
    f) BOOTLOADER_UPDATE_IMAGE="${OPTARG}"
       ;;
-   i) IGNORE_DPKG_CHECKSUMS=1
+   i)
+      # Script default is 1 but this could have been set to zero in the defaults file
+      IGNORE_DPKG_CHECKSUMS=1
       ;;
    j) JSON_OUTPUT="yes"
       ;;