raspberrypi/rpi-eeprom
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-eeprom.git synced 2026-01-21 14:53:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

rpi-eeprom-update: Fix CPU detection and improve documentation

Browse Source 
* 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.
This commit is contained in:
Tim Gover
2019-09-09 10:12:32 +01:00
parent 956c401701
commit 47f985542d
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
rpi-eeprom-update
View File

@@ -201,8 +201,24 @@ checkDependencies() {
usage() { usage() {
cat <<EOF cat <<EOF
rpi-eeprom-update [options]... [FILE] rpi-eeprom-update [options]... [FILE]
Checks whether the Raspberry Pi bootloader EEPROM is up-to-date and Checks whether there Raspberry Pi bootloader EEPROM is up to date and
optionally updates the EEPROM. 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} A backup of the current EEPROM config file is written to ${FIRMWARE_BACKUP_DIR}
before applying the update. before applying the update.
@@ -286,7 +302,7 @@ fileUpdate()
echo "*** INSTALLING ${1} ***" echo "*** INSTALLING ${1} ***"
[ -f "${1}" ] || die "\"${1}\" not found" [ -f "${1}" ] || die "\"${1}\" not found"
applyUpdate "$1" applyUpdate "$1"
echo "Bootloader EEPROM update complete. Please reboot." echo "Bootloader EEPROM update pending. Please reboot to apply the update."
} }
removePreviousUpdates() removePreviousUpdates()
@@ -352,7 +368,7 @@ FILE_UPDATE=""
MACHINE_OUTPUT="" MACHINE_OUTPUT=""
JSON_OUTPUT="no" 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 if [ "${CPU_VER}" != "3" ]; then
# Not a BCM2711, no EEPROMs to update. # Not a BCM2711, no EEPROMs to update.