imager: make-release: Drop the 'default' (unused) BOOT_ORDER release zip

* Minor changes to support CM5 bringup and test.

LICENSE

@@ -93,3 +93,25 @@ License: uIP
  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
+ 
+License: MIT
+ QR Code generator library (C)
+ 
+ Copyright (c) Project Nayuki. (MIT License)
+ https://www.nayuki.io/page/qr-code-generator-library
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ the Software, and to permit persons to whom the Software is furnished to do so,
+ subject to the following conditions:
+ - The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+ - The Software is provided "as is", without warranty of any kind, express or
+   implied, including but not limited to the warranties of merchantability,
+   fitness for a particular purpose and noninfringement. In no event shall the
+   authors or copyright holders be liable for any claim, damages or other
+   liability, whether in an action of contract, tort or otherwise, arising from,
+   out of or in connection with the Software or the use or other dealings in the
+   Software.

firmware-2711/release-notes.md

@@ -1,5 +1,17 @@
 # Raspberry Pi4 bootloader EEPROM release notes
 
+## 2024-05-17 - Ignore bootloader updates for Pi5 on Pi4 - (latest)
+  * Add timestamps to UART log messages.
+  * Add support for [tryboot] conditional the bootloader EEPROM
+    config file.
+    See: https://github.com/raspberrypi/rpi-eeprom/issues/454
+  * Fix MAX_RESTARTS parameter
+    See: https://github.com/raspberrypi/rpi-eeprom/issues/576
+  * Add recovery_reboot option to config.txt for rpiboot which causes
+    the system to reboot after updating the bootloader.
+  * Improve secure-boot OTP provisioning logging.
+  * Fix setting to enable secure-boot mode on Pi4B
+
 ## 2024-04-17 - Build Pi4 firmware from the mainline branch - STABLE
   * Switch to building the Pi4 firmware from the common Pi4/Pi5
     mainline release. This doesn't change the Pi4 features

firmware-2712/release-notes.md

@@ -1,5 +1,35 @@
 # Raspberry Pi5 bootloader EEPROM release notes
 
+## 2024-06-11: Promote pieeprom-2024-06-05 to the default release (default)
+
+## 2024-06-05: CM5 bringup changes (latest)
+* Minor changes to support CM5 bringup and test.
+
+## 2024-06-04: Fix [pi5] config.txt conditional state (latest)
+* The [pi5] conditional statement should apply to the entire pi5
+  family i.e. include cm5 as well.
+* Bump SDIO bus priorities to that a GPU/RAM intensive processes
+  can't unnecessarily stall an I/O processes.
+* Assorted log message tidyups.
+
+## 2024-05-17: Ignore bootloader updates for Pi5 on Pi4 - (latest)
+* Add timestamps to UART log messages
+
+2024-05-13: Add support for NVMe boot with PCIe switches (latest)
+* Add preliminary support for booting NVMe devices behind PCIe switches.
+  See: https://github.com/raspberrypi/firmware/issues/1833
+* Fix MAX_RESTARTS parameter
+  See: https://github.com/raspberrypi/rpi-eeprom/issues/576
+* arm_dt: Support HAT EEPROM dtparams
+* Fix reporting of the partition number via DT
+  See: https://github.com/raspberrypi/rpi-eeprom/issues/575
+* Resolve HID counting bug which caused Network Install to fail on some keyboards
+  See: Fixes https://github.com/raspberrypi/rpi-eeprom/issues/574
+* Pull PCIE DET_WAKE high by default on CM5
+
+2024-04-20: Fix SDRAM refesh timing (default) (automatic update)
+* Fix a possible performance regression on Pi5.
+
 2024-04-18: Promote the 2024-04-17 release to the default release (default) (automatic update)
 * Select pieeprom-2024-04-17.bin to be the new default release and bump the
   automatic update minimum version to this.

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 2024-04-17 "" "${script_dir}/2712-config" release-2712 rpi-boot-eeprom-recovery 2712
+${script_dir}/make-release critical 2024-06-05 "" "${script_dir}/2712-config" release-2712 rpi-boot-eeprom-recovery 2712

imager/make-release

@@ -90,7 +90,6 @@ rm -rf "${output_dir}"
 mkdir "${output_dir}"
 
 # Build the different boot priority flavours
-gen_release "${config_dir}/boot-conf-default.txt" "${output_dir}/${output_basename}-${tag}.zip"
 for variant in sd usb network; do
    gen_release "${config_dir}/boot-conf-${variant}.txt" "${output_dir}/${output_basename}-${tag}-${variant}.zip"
 done

rpi-eeprom-update

@@ -400,7 +400,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:-1713358463}"
+      BOOTLOADER_AUTO_UPDATE_MIN_VERSION="${BOOTLOADER_AUTO_UPDATE_MIN_VERSION:-1713610410}"
       SPIDEV=/dev/spidev10.0
       # Default is to use flashrom if availableon BCM2712
       RPI_EEPROM_USE_FLASHROM=${RPI_EEPROM_USE_FLASHROM:-1}