Merge branch 'master' into debian/buster

.github/ISSUE_TEMPLATE/.config.yml

@@ -0,0 +1,2 @@
+blank_issues_enabled: false
+

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,9 @@ assignees: ''
 
 ---
 
-For general boot questions please check the read the [Boot Problems] (https://www.raspberrypi.org/forums/viewtopic.php?t=58151) sticky post on the forums. 
+For general boot questions please check the read the [Boot Problems] (https://www.raspberrypi.org/forums/viewtopic.php?t=58151) sticky post on the forums.  
+
+N.B The bootloader does not persist in memory and if the rainbow splash screen has been displayed the issue is likely to be in the firmware or Linux. If so, it's better to target the bug in the [Firmware](https://github.com/raspberrypi/firmware/) or [Linux](https://github.com/raspberrypi/linux/) repositories first e.g. NFS, USB or dmesg logs would be Linux issues.
 
 **Describe the bug**
 A clear and concise description of what the bug is.

firmware/release-notes.md

@@ -1,5 +1,26 @@
 # Raspberry Pi4 bootloader EEPROM release notes
 
+## 2020-06-15 Increase default USB port power delay - BETA
+   * Increase the default power off delay to 500ms following more
+     interop testing.
+   * Make the USB port power off time configurable via the USB_MSD_PWR_OFF_TIME
+     config. The range may be set between 250 and 1000ms. Zero means no port
+     power off.
+   * Fix some issues in XHCI endpoint configuration where the code was wrong
+     but does not fail with the current VL805 FW.
+
+## 2020-06-12 Improve support for powered USB SATA devices - BETA
+   * Reset Ethernet MAC + PHY if final boot mode is not network boot
+     See: Kernel warning and network failure when attempting to use the network after bootloader times out. #144
+   * Improve handling of multiple bootable USB devices and remove USB_MSD_BOOT_MAX_RETRIES
+   * Resolve: No DHCPACK with DHCP relay agent #58
+   * Toggle USB root hub port power for 200ms on the first USB MSD boot attempt
+     See: Bootloader can't boot via USB-HDD after system reboot #151
+   * Update bootloader handover to support uart_2ndstage - requires
+     a newer start.elf firmware which will be via rpi-update.
+   * Assert PCIe fundamental reset if the final bootmode was not USB-MSD because
+     the OS might not do this before starting XHCI.
+
 ## 2020-06-03 Bootmode tweaks and fix issue with > 4TB drives - BETA
    * Resolve: Unable to boot from USB MSD - Seagate 5Tb HDD backup drive #139
    * Increase USB MSD timeout from 10 to 20 seconds.

releases.md

@@ -1,15 +1,19 @@
 # rpi-eeprom releases
 This page provides links to the production and development release images for the Raspberry Pi 4 bootloader EEPROM. Normally, the 
 bootloader is automatically updated after an APT update via the [rpi-eeprom-update](https://www.raspberrypi.org/documentation/hardware/raspberrypi/booteeprom.md)
-utility. However, it's sometimes more convenient to use a recovery image to program the EEPROM with default settings for a given release than 
-updating via Linux.
+utility. However, it's sometimes more convenient to use a recovery image to program the EEPROM with default settings for a given release, rather than updating via Linux.
 
-## Recovery Image
+## Release notes
+Release notes are available [here](https://github.com/raspberrypi/rpi-eeprom/blob/master/firmware/release-notes.md).
+
+## Recovery image
 The latest production recovery image is [2020-04-16](https://github.com/raspberrypi/rpi-eeprom/releases/tag/v2020.04.16-137ad). This
-is the version selected by the [Raspberry Pi Imager](https://www.raspberrypi.org/downloads/)
+is the version selected by the [Raspberry Pi Imager](https://www.raspberrypi.org/downloads/).
 
 ## USB MSD BETA
-The latest USB mass storage boot **BETA** recovery image is [2020-05-28](https://github.com/raspberrypi/rpi-eeprom/releases/tag/v2020.05.28-137ad)
+The latest USB mass storage boot **BETA** recovery image is [2020-06-15](https://github.com/raspberrypi/rpi-eeprom/releases/tag/v2020.06.15-137ad).
+
+For support please see this [forum thread](https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=277007)
 
 ## Previous releases
 All [previous releases](https://github.com/raspberrypi/rpi-eeprom/releases) are available here.
@@ -18,4 +22,4 @@ All [previous releases](https://github.com/raspberrypi/rpi-eeprom/releases) are
 Recovery images are only created for production images or for major test releases e.g. USB MSD boot. Old bootloader images are periodically
 removed from the APT package to reduce the disk space. The binaries can still be downloaded from Github [here](https://github.com/raspberrypi/rpi-eeprom/tree/master/firmware/old)
 but are not supported and may fail to boot on newer revisions of the hardware.
-e.g. The Pi 4 8GB requries bootloader version 2020-04-16 or newer.
+For example, the Pi 4 8GB requires bootloader version 2020-04-16 or newer.

rpi-eeprom-update

@@ -272,7 +272,7 @@ checkDependencies() {
    BOARD_TYPE=$(((0x$BOARD_INFO >> 4) & 0xff))
    BOARD_REVISION=$((0x$BOARD_INFO & 0xf))
 
-   if [ ${BOARD_TYPE} = 17 ] && [ ${BOARD_REVISION} \< 4 ]; then
+   if [ ${BOARD_TYPE} -eq 17 ] && [ ${BOARD_REVISION} -lt 4 ]; then
       echo "Dedicated VL805 EEPROM detected"
       HAVE_VL805_EEPROM=1
    else
@@ -539,7 +539,7 @@ lookupVersionInfo()
    if [ "${HAVE_VL805_EEPROM}" = 1 ]; then
       getVL805UpdateVersion
       if [ -n "${VL805_CURRENT_VERSION}" ] && [ -n "${VL805_UPDATE_VERSION}" ]; then
-         if [ "${VL805_CURRENT_VERSION}" \< "${VL805_UPDATE_VERSION}" ];  then
+         if [ "$((0x${VL805_CURRENT_VERSION}))" -lt "$((0x${VL805_UPDATE_VERSION}))" ];  then
             ACTION_UPDATE_VL805=1
          else
             VL805_UPDATE_IMAGE=""