Merge branch 'master' into debian/bullseye

firmware/release-notes.md

@@ -1,5 +1,13 @@
 # Raspberry Pi4 bootloader EEPROM release notes
 
+## 2022-10-03 - Add pieeprom-2022-10-03.bin - BETA
+   * Increase the size of USB in-transfers
+   * Increase TFTP_MAX_BLOCKSIZE to 1468
+   * stop NVMe cleanly
+
+## 2022-09-02 - Add pieeprom-2022-09-02 - BETA + STABLE
+   * Parse target MAC address in NETCONSOLE property https://github.com/raspberrypi/rpi-eeprom/issues/440
+
 ## 2022-08-02 - Add pieeprom-2022-08-02 - BETA + STABLE
    * Display the secure-boot configuration on the diagnostics screen
      if secure-boot is enabled.

rpi-eeprom-update

@@ -339,7 +339,10 @@ checkDependencies() {
 
    if [ ${BOARD_TYPE} -eq 20 ] && [ "${CM4_ENABLE_RPI_EEPROM_UPDATE}" != '1' ]; then
       # For CM4, USB device boot is the recommended method for EEPROM updates.
-      echo "rpi-eeprom-update is not enabled by default on CM4. Run with -h for more information."
+      echo "rpi-eeprom-update is not enabled by default on CM4."
+      echo "The recommended method for flashing the EEPROM is rpiboot."
+      echo "See: https://github.com/raspberrypi/usbboot/blob/master/Readme.md"
+      echo "Run with -h for more information."
       exit ${EXIT_SUCCESS}
    fi