Merge pull request #210 from XECDesign/debian/buster

Debian/buster

README.md

@@ -1,31 +1,16 @@
 # rpi-eeprom
-This repository contains the scripts and pre-compiled binaries used to create the rpi-eeprom package which is used to update the Raspberry Pi4 bootloader EEPROM.
+This repository contains the scripts and pre-compiled binaries used to create the `rpi-eeprom` package which is used to update the Raspberry Pi 4 bootloader and VLI EEPROMs.
 
 # Support
-For bootloader support the best place to start is the Raspberry Pi [General Users forum](https://www.raspberrypi.org/forums/viewforum.php?f=63) or for discussion of beta releases try the [Advanced Users forum](https://www.raspberrypi.org/forums/viewforum.php?f=29&sid=9bbc277968ad953e77749b255d0ce3a2)
+Please check the Raspberry Pi [general discussion forum](https://www.raspberrypi.org/forums/viewforum.php?f=63) if you have a support question. 
 
-N.B. Direct e-mail support questions will be ignored.
-
-# Rescue image
-If the Raspberry Pi4 is not booting, then it's very unlikely that the EEPROM is corrupted. The first thing that you should check is that the OS image was correctly installed using the Raspberry Pi Imager which is available on the [downloads page](https://www.raspberrypi.org/downloads/). If that doesn't work or you wish to revert EEPROM configuration changes to factory defaults then you can also create an EEPROM recovery SD card image using the Raspberry Pi Imager.
+# Reset to factory defaults
+The [Raspberry Pi Imager](https://www.raspberrypi.org/downloads/) provides an EEPROM recovery image which may be used to reset the bootloader and VLI EEPROMs to factory defaults.
 
 # Bootloader documentation
 * [The boot folder](https://www.raspberrypi.org/documentation/configuration/boot_folder.md)
 * [Config.txt boot options](https://www.raspberrypi.org/documentation/configuration/config-txt/boot.md)
 * [Bootloader EEPROM](https://www.raspberrypi.org/documentation/hardware/raspberrypi/booteeprom.md)
 * [Bootloader configuration](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md)
-
-# Bug reports
-Bootloader bugs are especially difficult to describe because there's no display. Where possible please include the following information in order to help identify the problem.
-* EEPROM version (vcgencmd bootloader_version or the pieeprom filename)
-* EEPROM config (from rpi-eeprom-config)
-* UART trace using USB serial cable
-* Wireshark trace for network boot. Filtering for DHCP and TFTP protocols or by mac-address for the Pi4 is fine.
-
-# BETA versions of the bootloader
-If you want to try the BETA version of the bootloader then we recommend that you always try this with a spare sd-card and are familiar with using the Raspberry Pi Imager to create recovery images to restore factory settings. For debugging you may find a USB serial cable useful.
-
-See also - [Firmware release status](https://www.raspberrypi.org/documentation/hardware/raspberrypi/booteeprom.md)
-
-Beta features are always documented [here](https://github.com/raspberrypi/rpi-eeprom/blob/master/firmware/release-notes.md) first. Once the configuration has stabalised then the [Bootloader configuration](https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md) will be updated, however, there's normally a bit of a delay in order to allow official documentation to be reviewed.
-
+* [Release notes](firmware/release-notes.md)
+* [Releases](releases.md)

debian/changelog

@@ -1,3 +1,22 @@
+rpi-eeprom (7.11-1) buster; urgency=medium
+
+  [ Tim Gover ]
+  * pieeprom-2020-08-31 - Disable self update mode from SD cards
+  * Update link to latest stable release
+  * Update releases.md
+  * Update README.md
+
+  [ andrum99 ]
+  * Update README.md
+
+  [ Hristo Venev ]
+  * rpi-eeprom-update: Upstream kernel fix
+
+  [ Serge Schneider ]
+  * Use Python 3
+
+ -- Serge Schneider <serge@raspberrypi.com>  Tue, 01 Sep 2020 14:02:00 +0100
+
 rpi-eeprom (7.10-1) buster; urgency=medium
 
   [ Andrew Scheller ]

firmware/release-notes.md

@@ -3,6 +3,12 @@
 USB MSD boot also requires updated beta GPU firmware. Please read
 https://www.raspberrypi.org/documentation/hardware/raspberrypi/bcm2711_bootloader_config.md
 
+## 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
+     pieeprom.upd files would be installed automatically e.g. if the
+     rpi-eeprom-update service has been disabled.
+
 ## 2020-08-10 Promote 2020-07-31 release to STABLE
    * The USB port power management change from the last BETA improves
      compatiblity for devices which during reset with no regressions reported.

releases.md

@@ -11,7 +11,7 @@ The latest production recovery image is [2020-04-16](https://github.com/raspberr
 is the version selected by the [Raspberry Pi Imager](https://www.raspberrypi.org/downloads/).
 
 ## USB MSD boot
-The latest USB mass storage boot recovery image is [2020-07-16](https://github.com/raspberrypi/rpi-eeprom/releases/tag/v2020.07.16-138a1).
+The latest USB mass storage boot recovery image is [2020-07-31](https://github.com/raspberrypi/rpi-eeprom/releases/tag/v2020.07.31-138a1).
 
 For support please see this [forum thread](https://www.raspberrypi.org/forums/viewtopic.php?f=63&t=277007)
 

rpi-eeprom-update

@@ -268,7 +268,7 @@ getBootloaderUpdateVersion() {
 }
 
 checkDependencies() {
-   BOARD_INFO="$(sed -n '/^Revision/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo)"
+   BOARD_INFO="$(hexdump -e '1/1 "%02x"' /sys/firmware/devicetree/base/system/linux,revision)"
    if [ $(((0x$BOARD_INFO >> 23) & 1)) -ne 0 ] && [ $(((0x$BOARD_INFO >> 12) & 15)) -eq 3 ]; then
       echo "BCM2711 detected"
    else