From 956c401701ce3b5f4df494f1e1cfa9f8e01f7e70 Mon Sep 17 00:00:00 2001
From: Tim Gover <tim.gover@raspberrypi.org>
Date: Mon, 9 Sep 2019 09:50:08 +0100
Subject: [PATCH 1/2] Move release notes to rpi-eeprom repository

Store the release notes here instead of github/raspberrypi/documentation
---
 firmware/release-notes.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 firmware/release-notes.md

diff --git a/firmware/release-notes.md b/firmware/release-notes.md
new file mode 100644
index 0000000..cfe1ab3
--- /dev/null
+++ b/firmware/release-notes.md
@@ -0,0 +1,17 @@
+# Raspberry Pi4 bootloader EEPROM release notes
+
+## 2019-09-05 - Git d8189ed4 - (BETA)
+   * Update SDRAM setup to reduce power consumption.
+
+## 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. 
+   * 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.
+   * Load start4db.elf / fixup4db.dat in preference to start_db.elf / fixup_db.dat on Pi4.
+   * Embed BUILD_TIMESTAMP in the EEPROM image to assist version checking.
+
+## 2019-05-10 - Git d2402c53 (RC2.1)
+   * First production version.

From 47f985542de707b624af5e293c571b7c86163706 Mon Sep 17 00:00:00 2001
From: Tim Gover <tim.gover@raspberrypi.org>
Date: Mon, 9 Sep 2019 10:12:32 +0100
Subject: [PATCH 2/2] rpi-eeprom-update: Fix CPU detection and improve
 documentation

* Use vcgencmd otp_dump to get the board-revision because the format
  is predictable.
* Change the -f completion message to indicate that the update is
  scheduled rather than complete.
* Add some notes to help about the update mechanism.
---
 rpi-eeprom-update | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/rpi-eeprom-update b/rpi-eeprom-update
index c6b0032..60e3dcd 100755
--- a/rpi-eeprom-update
+++ b/rpi-eeprom-update
@@ -201,8 +201,24 @@ checkDependencies() {
 usage() {
 cat <<EOF
 rpi-eeprom-update [options]... [FILE]
-   Checks whether the Raspberry Pi bootloader EEPROM is up-to-date and
-   optionally updates the EEPROM.
+   Checks whether there Raspberry Pi bootloader EEPROM is up to date and
+   optionally updates the EEPROM at the next reboot.
+
+   The default update mechanism writes recovery.bin and pieeprom.upd to the
+   boot partition on the sd-card. At the next reboot the ROM runs recovery.bin
+   which flashes pieeprom.upd to the EEPROM. If the EEPROM update was successful
+   recovery.bin renames itself to recovery.000 to prevent it from running a
+   second time then resets the system. The system should then boot normally.
+
+   If /boot does not correspond to the boot partition on the sd-card and this
+   is not a NOOBS system then the mount point for BOOTFS should be defined
+   in /etc/default/rpi-eeprom-update
+
+   For reference, the flashrom update mechanism may be enabled by defining
+   USE_FLASHROM=1 in /etc/default/rpi-eeprom-update. This not recommended
+   because the SPI pins are muxed with audio and other device drivers may
+   be using SPI (e.g. HATs). This is also not safe in the event of a power
+   failure during the update of the EEPROM.
 
    A backup of the current EEPROM config file is written to ${FIRMWARE_BACKUP_DIR}
    before applying the update.
@@ -286,7 +302,7 @@ fileUpdate()
    echo "*** INSTALLING ${1} ***"
    [ -f "${1}" ] || die "\"${1}\" not found"
    applyUpdate "$1"
-   echo "Bootloader EEPROM update complete. Please reboot."
+   echo "Bootloader EEPROM update pending. Please reboot to apply the update."
 }
 
 removePreviousUpdates()
@@ -352,7 +368,7 @@ FILE_UPDATE=""
 MACHINE_OUTPUT=""
 JSON_OUTPUT="no"
 
-CPU_VER="$(grep Revision /proc/cpuinfo | awk '{print $3}' | cut -c3)"
+CPU_VER="$(vcgencmd otp_dump | grep 30: | cut -c8)"
 
 if [ "${CPU_VER}" != "3" ]; then
    # Not a BCM2711, no EEPROMs to update.