Merge branch 'master' into debian/bookworm

firmware-2712/release-notes.md

@@ -1,5 +1,12 @@
 # Raspberry Pi5 bootloader EEPROM release notes
 
+2024-02-05: Add support for HAT+ POE HATs (latest)
+* Add support for probing HAT+ POE HATs
+* Implement DWC3 specific XHCI quirks
+
+2024-01-24: NVMe boot fix for WD NVMe (latest)
+* Add a workaround for an issue seen when booting with WD Blue SN550 NVMe SSD
+
 2024-01-22: Add support for network-install (latest)
 * Fix issue boot.img end sector check - STABLE
   See:  https://github.com/raspberrypi/rpi-eeprom/issues/521

rpi-eeprom-update

@@ -404,6 +404,10 @@ checkDependencies() {
    # Default to off - in the future Raspberry Pi 5 may default to using flashrom if
    # flashrom is available.
    [ -z "${RPI_EEPROM_USE_FLASHROM}" ] && RPI_EEPROM_USE_FLASHROM=0
+   if [ "${RPI_EEPROM_USE_FLASHROM}" -eq 1 ] && ! command -v flashrom > /dev/null; then
+      echo "WARNING: flashrom not found. Setting RPI_EEPROM_USE_FLASHROM to 0"
+      RPI_EEPROM_USE_FLASHROM=0
+   fi
 
    FIRMWARE_IMAGE_DIR="${FIRMWARE_ROOT}-${BCM_CHIP}/${FIRMWARE_RELEASE_STATUS}"
    if ! [ -d "${FIRMWARE_IMAGE_DIR}" ]; then
@@ -483,10 +487,6 @@ checkDependencies() {
    if [ "${BCM_CHIP}" = 2711 ] && [ ! -f "${RECOVERY_BIN}" ]; then
       die "${RECOVERY_BIN} not found."
    fi
-
-   if ! command -v flashrom > /dev/null; then
-      RPI_EEPROM_USE_FLASHROM=0
-   fi
 }
 
 usage() {