Merge branch 'master' into debian/bookworm

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,20 @@
 # Raspberry Pi5 bootloader EEPROM release notes
 
+## 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.