Merge pull request #178 from XECDesign/debian/buster

Debian/buster

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,7 @@ 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.
 

debian/changelog

@@ -1,3 +1,30 @@
+rpi-eeprom (7.5-1) buster; urgency=medium
+
+  [ Tim Gover ]
+  * Feature requests
+  * Update bug_report.md
+  * Fix date in release notes see #158
+
+  [ RaspberryPiFan ]
+  * Fix a link
+
+  [ Tim Gover ]
+  * Update releases.md
+
+  [ Dave Jones ]
+  * Query checksums from rpi-eeprom instead of rpi-eeprom-images
+
+  [ Pyry Kontio ]
+  * Use /usr/bin/env python to make rpi-eeprom-config more portable
+
+  [ Tim Gover ]
+  * pieeprom-2020-07-06 - BETA
+    - Tweak USB port power and clear ACT LED after SPI
+  * Fix release notes title
+  * Disable rpi-eeprom-update by default on CM4
+
+ -- Serge Schneider <serge@raspberrypi.com>  Wed, 08 Jul 2020 00:18:35 +0100
+
 rpi-eeprom (7.4-1) buster; urgency=medium
 
   [ Tim Gover ]

debian/control

@@ -2,7 +2,7 @@ Source: rpi-eeprom
 Section: misc
 Priority: optional
 Maintainer: Serge Schneider <serge@raspberrypi.org>
-Build-Depends: debhelper (>= 11), help2man, python-minimal | python3-minimal
+Build-Depends: debhelper (>= 11), help2man, python-minimal
 Standards-Version: 4.1.3
 Homepage: https://github.com/raspberrypi/rpi-eeprom/
 Vcs-Browser: https://github.com/raspberrypi/rpi-eeprom/
@@ -11,7 +11,7 @@ Vcs-Git: https://github.com/raspberrypi/rpi-eeprom.git
 Package: rpi-eeprom
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, rpi-eeprom-images, libraspberrypi-bin,
- python | python3, binutils, raspberrypi-bootloader (>= 1.20190819), pciutils
+ python, binutils, raspberrypi-bootloader (>= 1.20190819), pciutils
 Breaks: rpi-eeprom-images (<<7.2)
 Replaces: rpi-eeprom-images (<<7.2)
 Recommends: flashrom
@@ -22,7 +22,7 @@ Description: Raspberry Pi 4 boot EEPROM updater
 
 Package: rpi-eeprom-images
 Architecture: all
-Depends: rpi-eeprom (>=7.2)
+Depends: ${misc:Depends}, rpi-eeprom (>=7.2)
 Priority: optional
 Section: oldlibs
 Description: transitional package

firmware/release-notes.md

@@ -1,6 +1,19 @@
 # Raspberry Pi4 bootloader EEPROM release notes
 
-## 2020-06-17 Promote 2020-06-16 to STABLE
+USB MSD boot also requires updated beta GPU firmware. Please read
+https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md
+
+
+## 2020-07-09 Tweak USB port power and clear ACT LED after SPI - BETA
+   * Increase port power off limit to 5 seconds.
+   * Increase the port power off default to 1 second. This seems to cover most
+     commonly seen USB MSD devices which require the USB port power to be disabled
+     after the USB HC chip is reset.
+   * Reset activity LED after SPI access to reduce the number of spurious LED flashes.
+   * Add SPI error diagnostic error code (3 long 1 short) if SPI commands timeout.
+     (So far this failure has not been observed on failed boards)
+
+## 2020-06-17 Promote 2020-06-15 to STABLE
    * Promote the latest beta EEPROM and recovery.bin to stable and
      feature freeze USB MSD support until a production release is ready.
 

releases.md

@@ -10,11 +10,13 @@ Release notes are available [here](https://github.com/raspberrypi/rpi-eeprom/blo
 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/).
 
-## USB MSD BETA
-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).
+## USB MSD boot
+The latest USB mass storage boot 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)
 
+N.B. Although the bootloader has now been promoted to a stable / feature-freeze release USB MSD should still be considered BETA software because this requires updates to the GPU firmware. 
+
 ## Previous releases
 All [previous releases](https://github.com/raspberrypi/rpi-eeprom/releases) are available here.
 

rpi-eeprom-config

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 
 # rpi-eeprom-config
 # Utility for reading and writing the configuration file in the

rpi-eeprom-update

@@ -32,6 +32,7 @@ USE_FLASHROM=${USE_FLASHROM:-0}
 RECOVERY_BIN=${RECOVERY_BIN:-${FIRMWARE_ROOT}/${FIRMWARE_RELEASE_STATUS}/recovery.bin}
 BOOTFS=${BOOTFS:-/boot}
 VCMAILBOX=${VCMAILBOX:-/opt/vc/bin/vcmailbox}
+CM4_ENABLE_RPI_EEPROM_UPDATE=${CM4_ENABLE_RPI_EEPROM_UPDATE:-0}
 
 EXIT_SUCCESS=0
 EXIT_UPDATE_REQUIRED=1
@@ -176,7 +177,7 @@ applyRecoveryUpdate()
 }
 
 applyUpdate() {
-   checksums_file="/var/lib/dpkg/info/rpi-eeprom-images.md5sums"
+   checksums_file="/var/lib/dpkg/info/rpi-eeprom.md5sums"
 
    [ "$(id -u)" = "0" ] || die "* Must be run as root - try 'sudo rpi-eeprom-update'"
 
@@ -185,7 +186,7 @@ applyUpdate() {
          cd /
          if ! md5sum -c "${checksums_file}" > /dev/null 2>&1; then
             md5sum -c "${checksums_file}"
-            die "rpi-eeprom-images checksums failed - try reinstalling this package"
+            die "rpi-eeprom checksums failed - try reinstalling this package"
          fi
       )
    fi
@@ -272,6 +273,12 @@ checkDependencies() {
    BOARD_TYPE=$(((0x$BOARD_INFO >> 4) & 0xff))
    BOARD_REVISION=$((0x$BOARD_INFO & 0xf))
 
+   if [ ${BOARD_TYPE} -eq 20 ] && [ ${CM4_ENABLE_RPI_EEPROM_UPDATE} != '1' ]; then
+      # For CM4, USB device boot is the recommended method for EEPROM updates.
+      echo "rpi-eeprom-update is not enabled by default on CM4"
+      exit ${EXIT_SUCCESS}
+   fi
+
    if [ ${BOARD_TYPE} -eq 17 ] && [ ${BOARD_REVISION} -lt 4 ]; then
       echo "Dedicated VL805 EEPROM detected"
       HAVE_VL805_EEPROM=1