Merge branch 'master' into debian/buster

firmware/release-notes.md

@@ -3,6 +3,14 @@
 USB MSD boot also requires updated beta GPU firmware. Please read
 https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md
 
+## 2020-09-02 Only use green LED for error status in bootloader
+   * Turn the green LED on and leave it on unless an error code occurs.
+     Previously, SD activity was displayed but that plus muxing with the
+     SPI CS made the LED activity confusing.
+     The HDMI diagnostics screen now provides much better information
+     for determing if the bootloader is running or frozen.
+   * CM4 enable GPIO for SD power.
+
 ## 2020-08-31 Disable self-update from SD card - BETA
    * Since the ROM will load recovery.bin from the SD card self update is not
      required. Although it functions correctly there is a small risk stale

rpi-eeprom-update

@@ -268,7 +268,7 @@ getBootloaderUpdateVersion() {
 }
 
 checkDependencies() {
-   BOARD_INFO="$(hexdump -ve '1/1 "%02x"' /sys/firmware/devicetree/base/system/linux,revision)"
+   BOARD_INFO="$(od -An -t x1 /sys/firmware/devicetree/base/system/linux,revision | tr -d ' ')"
    if [ $(((0x$BOARD_INFO >> 23) & 1)) -ne 0 ] && [ $(((0x$BOARD_INFO >> 12) & 15)) -eq 3 ]; then
       echo "BCM2711 detected"
    else