Merge pull request #326 from XECDesign/debian/buster

Debian/buster

README.md

@@ -1,11 +1,11 @@
 # 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 Pi 4 bootloader and VLI USB xHCI controller EEPROMs.
+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 USB controller EEPROMs.
 
 # Support
 Please check the Raspberry Pi [general discussion forum](https://www.raspberrypi.org/forums/viewforum.php?f=63) if you have a support question. 
 
 # Reset to factory defaults
-The [Raspberry Pi Imager](https://www.raspberrypi.org/downloads/) provides GUI for creating a GUI to update the bootloader and configure the default boot-mode.
+To reset the bootloader back to factory defaults use [Raspberry Pi Imager](https://www.raspberrypi.org/downloads/) to write an EEPROM update image to a spare SD card. Select `Misc utility images` under the `Operating System` tab.
 
 # Bootloader documentation
 * [The boot folder](https://www.raspberrypi.org/documentation/configuration/boot_folder.md)

debian/changelog

@@ -1,3 +1,14 @@
+rpi-eeprom (12.1-1) buster; urgency=medium
+
+  [ Andrew Scheller ]
+  * Fix typos in test script
+
+  [ Tim Gover ]
+  * Update README.md
+  * recovery.bin: Fix error pattern handling for HDMI/SDRAM failures
+
+ -- Serge Schneider <serge@raspberrypi.com>  Thu, 15 Apr 2021 12:27:10 +0100
+
 rpi-eeprom (12.0-1) buster; urgency=medium
 
   [ andrum99 ]

firmware/release-notes.md

@@ -3,6 +3,10 @@
 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-04-13 - Fix error pattern for HDMI and SDRAM failures - BETA/STABLE
+   * Fix recovery.bin error handler so that the LED error pattern is still
+     displayed even if HDMI or SDRAM fail.
+
 ## 2021-03-18 - Fix occasional reboot fail on Pi4B pre 1.4 - STABLE
    * Fix GPIO expander reset issue on some Pi4B 1.1 to 1.3 boards
 

test/test-rpi-eeprom-config

@@ -23,7 +23,7 @@ trap cleanup EXIT
 check_reduce_size()
 {
    # Verify that unused bytes are set to 0xff if the size of the config file is reduced.
-   echo "check_update $1 $2"
+   echo "check_reduce_size $1 $2"
 
    image="${script_dir}/$1"
    conf="${script_dir}/$2"
@@ -61,7 +61,7 @@ check_reduce_size()
 
 check_loopback()
 {
-   echo "check_update $1 $2"
+   echo "check_loopback $1 $2"
 
    image="${script_dir}/$1"
    conf="${script_dir}/$2"