Merge pull request #145 from XECDesign/debian/buster

Debian/buster

debian/changelog

@@ -1,3 +1,26 @@
+rpi-eeprom (7.2-1) buster; urgency=medium
+
+  [ MilhouseVH ]
+  * include vl805 eeprom presence in machine output
+
+  [ Andrew Scheller ]
+  * small typos
+
+  [ Tim Gover ]
+  * Create releases.md
+  * pieeprom-2020-06-03: Bootmode tweaks and fix issue with > 4TB drives - BETA
+  * rpi-eeprom-update: Remove warning in -f section
+
+  [ andrum99 ]
+  * rpi-eeprom-update - fix description of -d flag
+  * Clarify -d option when EEPROM update not needed
+  * reword
+
+  [ Serge Schneider ]
+  * Merge rpi-eeprom-images into rpi-eeprom package
+
+ -- Serge Schneider <serge@raspberrypi.org>  Thu, 04 Jun 2020 00:40:45 +0100
+
 rpi-eeprom (7.1-1) buster; urgency=medium
 
   [ Tim Gover ]

debian/control

@@ -12,13 +12,18 @@ Package: rpi-eeprom
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, rpi-eeprom-images, libraspberrypi-bin,
  python, binutils, raspberrypi-bootloader (>= 1.20190819), pciutils
+Breaks: rpi-eeprom-images (<<7.2)
+Replaces: rpi-eeprom-images (<<7.2)
 Recommends: flashrom
+Provides: rpi-eeprom-images
 Description: Raspberry Pi 4 boot EEPROM updater
  Checks whether the Raspberry Pi bootloader EEPROM is up-to-date and updates
  the EEPROM.
 
 Package: rpi-eeprom-images
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: rpi-eeprom (>=7.2)
-Description: Raspberry Pi 4 boot EEPROM images
+Priority: optional
- This package contains the bootloader EEPROM images for Raspberry Pi 4
+Section: oldlibs
+Description: transitional package
+ This is a transitional package. It can safely be removed.

debian/rpi-eeprom-images.install

@@ -1,4 +0,0 @@
-firmware/critical lib/firmware/raspberrypi/bootloader/
-firmware/stable lib/firmware/raspberrypi/bootloader/
-firmware/beta lib/firmware/raspberrypi/bootloader/
-firmware/release-notes.md lib/firmware/raspberrypi/bootloader/

debian/rpi-eeprom.install

@@ -1,3 +1,8 @@
 rpi-eeprom-config usr/bin/
 rpi-eeprom-update usr/bin/
 debian/default/ etc/
+
+firmware/critical lib/firmware/raspberrypi/bootloader/
+firmware/stable lib/firmware/raspberrypi/bootloader/
+firmware/beta lib/firmware/raspberrypi/bootloader/
+firmware/release-notes.md lib/firmware/raspberrypi/bootloader/

firmware/release-notes.md

@@ -1,5 +1,21 @@
 # Raspberry Pi4 bootloader EEPROM release notes
 
+## 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.
+   * Max retries now default to zero because the default BOOT_ORDER includes
+     restart (0xf). Therefore, each boot-mode is now tried once before moving
+     to the next mode. The retries mechanism is largely redudant now that
+     the loop/restart mode exists.
+   * If TFTP fails and network boot retries > 0 then wait 5 seconds before
+     retrying to avoid overloading a misconfigured TFTP server.
+   * Map undefined boot-modes in BOOT_ORDER to SD (0x1) instead of stopping.
+   * Add missing pieeprom-2020-05-28
+
+## 2020-05-28 Secondary fix for VL805 readback issue - BETA
+    * Re-upload 2020-05-28 after Git issue
+    * rpi-eeprom-update for new board revisions
+
 ## 2020-05-27 Fix DPI issue - BETA
     * Resolve: DPI failure after HDMI diagnostics screen in beta bootloader #133
     * Resolve: VL805 readback failure in the bootloader #134
@@ -83,20 +99,20 @@
        * SUBNET
        * GATEWAY
        * TFTP_IP
-    * If a fatal bootloader error occurs then an HDMI diagnostics screen is 
+    * If a fatal bootloader error occurs then an HDMI diagnostics screen is
-      displayed at VGA/DVI resolution on both outputs for two minutes. 
+      displayed at VGA/DVI resolution on both outputs for two minutes.
-      This may be disabled by setting DISABLE_HDMI=1 in the EEPROM 
+      This may be disabled by setting DISABLE_HDMI=1 in the EEPROM
       configuration OR setting display_splash=1 in config.txt.
     * Allow the PXE menu option to match a custom string specified by
       PXE_OPTION43. The default is still "Raspberry Pi Boot"
-    * DHCP_OPTION97 - The default GUID has now changed to 
+    * DHCP_OPTION97 - The default GUID has now changed to
       RPI4+BOARD_ID+ETH_MAC_LSB+SERIAL in order to make it easier to
       automatically identify Raspberry Pi computers. The old behaviour
       is enabled by setting DHCP_OPTION97=0 which simply repeats the serial
       number 4 times.
     * SELF_UPDATE. If SELF_UPDATE is set to 1 in the EEPROM configuration AND
       config.txt contains bootloader_update=1 then the bootloader will looking
-      for pieeprom.upd and vl805.bin and apply these firmware files if 
+      for pieeprom.upd and vl805.bin and apply these firmware files if
       they are different to the current image, before doing a watchdog reset.
       This should make it easier to update the bootloader for network
       booted setups because an SD card is not required for recovery.bin.
@@ -117,7 +133,7 @@
       beta folder.
 
 ## 2020-01-22 - vl805 00137ad
-    * Set the default/critical vl805 version to be 00137ad. This has the 
+    * Set the default/critical vl805 version to be 00137ad. This has the
       same power savings as 0137ab but with fixes for USB webcams.
 
 ## 2020-01-17 - Git 5e86aac5f (BETA) RC4
@@ -185,7 +201,7 @@
 ## 2019-07-15 - Git 514670a2
    * Turn green LED activity off on halt.
    * Pad embedded config file with spaces for easier editing by end users.
-   * Halt now behaves the same as earlier Pi models to improve power behavior at halt for HATs. 
+   * Halt now behaves the same as earlier Pi models to improve power behavior at halt for HATs.
    * WAKE_ON_GPIO now defaults to 1 in the EEPROM config file.
    * POWER_OFF_ON_HALT setting added defaulting to zero. Set this to 1 to restore the behavior where 'sudo halt' powers off all PMIC output.
    * If WAKE_ON_GPIO=1 then POWER_OFF_ON_HALT is ignored.

releases.md

@@ -0,0 +1,21 @@
+# 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.
+
+## 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/)
+
+## 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)
+
+## Previous releases
+All [previous releases](https://github.com/raspberrypi/rpi-eeprom/releases) are available here.
+
+## Old EEPROM images
+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.

rpi-eeprom-update

@@ -351,15 +351,19 @@ in /etc/default/rpi-eeprom-update by defining the BOOTFS variable.
 A backup of the current EEPROM config file is written to ${FIRMWARE_BACKUP_DIR}
 before applying the update.
 
+Unless the -d flag is specified, the current bootloader configuration is
+retained.
+
 Options:
    -a Automatically install bootloader and USB (VLI) EEPROM updates.
    -A Specify which type of EEPROM to automatically update (vl805 or bootloader)
-   -d Use the default bootloader config instead of migrating the current settings
+   -d Use the default bootloader config, or if a file is specified using the -f
+      flag use the config in that file. This option only applies when a
+      bootloader EEPROM update is needed; if the bootloader EEPROM is up-to-date
+      then its config will not be changed.
    -f Install the given file instead of the latest applicable update
       Ignores the FREEZE_VERSION flag in bootloader and is intended for manual
       firmware updates.
-      WARNING: This command should only be run from console mode in order to
-      avoid conflicts/deadlock with dtoverlay/dtparam settings.
    -h Display help text and exit
    -i Ignore package checksums - for rpi-eeprom developers.
    -j Write status information using JSON notation
@@ -404,8 +408,8 @@ Release status:
 
 critical: The latest production release plus important security or hardware compatibility bug fixes.
 
-stable: Contains new features have already undergone some beta testing.
+stable: Contains new features that have already undergone some beta testing.
-These are candidats for new production releases.
+These are candidates for new production releases.
 
 beta: New features, bug fixes for development/test purposes. Use at your own
 risk!
@@ -632,21 +636,25 @@ write_status_info()
    vl805_new="${VL805_UPDATE_VERSION}"
 
     if [ "${JSON_OUTPUT}" = "no" ]; then
+      [ "${HAVE_VL805_EEPROM}" = "0" ] && vl805_eeprom="no" || vl805_eeprom="yes"
       cat > "${MACHINE_OUTPUT}" <<EOF
 EXITCODE="${exit_code}"
 BOOTLOADER_CURRENT=${bootloader_cur}
 BOOTLOADER_LATEST=${bootloader_new}
 VL805_CURRENT="${vl805_cur}"
 VL805_LATEST="${vl805_new}"
+VL805_EEPROM="${vl805_eeprom}"
 EOF
    else
+      [ "${HAVE_VL805_EEPROM}" = "0" ] && vl805_eeprom="false" || vl805_eeprom="true"
       cat > "${MACHINE_OUTPUT}" <<EOF
 {
   "EXITCODE": "${exit_code}",
   "BOOTLOADER_CURRENT": ${bootloader_cur},
   "BOOTLOADER_LATEST": ${bootloader_new},
   "VL805_CURRENT": "${vl805_cur}",
-  "VL805_LATEST": "${vl805_new}"
+  "VL805_LATEST": "${vl805_new}",
+  "VL805_EEPROM": ${vl805_eeprom}
 }
 EOF
    fi