Merge pull request #274 from XECDesign/debian/buster

Debian/buster

debian/changelog

@@ -1,3 +1,19 @@
+rpi-eeprom (11.2-1) buster; urgency=medium
+
+  [ andrum99 ]
+  * release-notes.md: label 2020-01-05 release as BETA
+
+  [ Andrew Scheller ]
+  * typo
+
+  [ Tim Gover ]
+  * rpi-eeprom-update: Get bootloader build-timestamp from device-tree
+  * rpi-eeprom-update: Add default/latest symlinks to reflect raspi-config
+     naming
+  * pieeprom-2021-01-11: Timeout stalled USB MSD devices - BETA
+
+ -- Serge Schneider <serge@raspberrypi.com>  Tue, 12 Jan 2021 14:17:11 +0000
+
 rpi-eeprom (11.1-1) buster; urgency=medium
 
   [ Tim Gover ]

debian/default/rpi-eeprom-update

@@ -1 +1 @@
-FIRMWARE_RELEASE_STATUS="critical"
+FIRMWARE_RELEASE_STATUS="default"

debian/rpi-eeprom.install

@@ -2,6 +2,9 @@ rpi-eeprom-config usr/bin/
 rpi-eeprom-update usr/bin/
 debian/default/ etc/
 
+firmware/default lib/firmware/raspberrypi/bootloader/
+firmware/latest lib/firmware/raspberrypi/bootloader/
+
 firmware/critical lib/firmware/raspberrypi/bootloader/
 firmware/stable lib/firmware/raspberrypi/bootloader/
 firmware/beta lib/firmware/raspberrypi/bootloader/

firmware/default

@@ -0,0 +1 @@
+critical

firmware/latest

@@ -0,0 +1 @@
+stable

firmware/release-notes.md

@@ -3,10 +3,16 @@
 USB MSD boot also requires the firmware from Raspberry Pi OS 2020-08-20 or newer.
 https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md
 
-## 2021-01-05 - USB MSD interop improvements for Pi 4B < R1.4
+## 2021-01-11 - Timeout stalled USB MSD devices - BETA
+   * Timeout USB MSD commands and move to the next boot mode if a device stops responding.
+   * Reset the GPIO expander at power on.
+   * Use the bootloader build timestamp instead of zero for the update-timestamp
+     if it is not defined in the .sig file.
+
+## 2021-01-05 - USB MSD interop improvements for Pi 4B < R1.4 - BETA
    * Revert the USB port power delay on R1.1 boards to be more like the Sep 2020
      production release. Verified with Geekworm X835, Orico NVME M.2 USB adapter
-     and Microsoft Wireless keyboad.
+     and Microsoft Wireless keyboard.
    * Increase the HDMI delay to 8 seconds.
 
 ## 2020-12-14 - Promote pieeprom-2020-12-11.bin to stable - STABLE

rpi-eeprom-update

@@ -34,6 +34,8 @@ BOOTFS=${BOOTFS:-/boot}
 VCMAILBOX=${VCMAILBOX:-/opt/vc/bin/vcmailbox}
 CM4_ENABLE_RPI_EEPROM_UPDATE=${CM4_ENABLE_RPI_EEPROM_UPDATE:-0}
 
+DT_BOOTLOADER_TS=${DT_BOOTLOADER_TS:-/proc/device-tree/chosen/bootloader/build-timestamp}
+
 EXIT_SUCCESS=0
 EXIT_UPDATE_REQUIRED=1
 EXIT_FAILED=2
@@ -267,7 +269,10 @@ applyUpdate() {
 # this via flashrom to avoid unnecessary audio glitches.
 BOOTLOADER_CURRENT_VERSION=
 getBootloaderCurrentVersion() {
-   if vcgencmd bootloader_version | grep -q timestamp; then
+   if [ -f "${DT_BOOTLOADER_TS}" ]; then
+      # Prefer device-tree to vcgencmd
+      BOOTLOADER_CURRENT_VERSION=$(printf "%d" "0x$(od "${DT_BOOTLOADER_TS}" -v -An -t x1 | tr -d ' ' )")
+   elif vcgencmd bootloader_version | grep -q timestamp; then
       BOOTLOADER_CURRENT_VERSION=$(vcgencmd bootloader_version | grep timestamp | awk '{print $2}')
       if [ "${BOOTLOADER_CURRENT_VERSION}" = "0" ]; then
          # If a timestamp of zero is returned then it's new firmware but an
@@ -332,8 +337,12 @@ checkDependencies() {
       HAVE_VL805_EEPROM=0
    fi
 
-   if ! command -v vcgencmd  > /dev/null; then
-      die "vcgencmd not found. On Debian, try installing the libraspberrypi-bin package."
+   # vcgencmd bootloader_version is deprecated. Use device-tree if available to
+   # reduce the number of dependencies on VCHI.
+   if ! [ -f "${DT_BOOTLOADER_TS}" ]; then
+      if ! command -v vcgencmd > /dev/null; then
+         die "vcgencmd not found. On Debian, try installing the libraspberrypi-bin package."
+      fi
    fi
 
    if [ ! -d "${FIRMWARE_IMAGE_DIR}" ]; then