raspberrypi/rpi-update
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-update.git synced 2026-01-20 21:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Inform the user if the bootloader EEPROM is out of date (#286)

Browse Source 
It's normally desirable to use the latest bootloader when testing the
latest firmware releases. rpi-eeprom-update is specific to Raspbian but
so rpi-update can't easily do the EEPROM update itself without
duplicating all the functionality. Instead, just indicate that the
bootloader is out of date unless FREEZE_VERSION has been specified.

N.B. The MIN_VERSION is set to the Sep-10 release which was
to stable today on Sep 18.
This commit is contained in:
timg
2019-09-20 18:15:07 +01:00
committed by popcornmix
parent 0f15053258
commit 8abc084233
1 changed files with 62 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
rpi-update
View File

@@ -177,6 +177,67 @@ function update_sdk {
fi fi
} }
# Check if the bootloader is older than the latest critical release. An old
# bootloader shouldn't block rpi-update so just inform the user that bootloader
# is out of date.
function check_eeprom_version {
local CURRENT_VERSION=""
local FIRST_VERSION=1557513636
# MIN VERSION for Sep 10 2019 EEPROM
local MIN_VERSION=1568112110
local HAVE_BOOTLOADER_EEPROM=0
# Skip EEPROM check if vcgencmd is missing because it won't be possible to
# check the version.
if ! command -v vcgencmd > /dev/null; then
return
fi
rev="$(sed -n '/^Revision/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo)"
if [ $(((0x$rev >> 23) & 1)) -ne 0 ] && [ $(((0x$rev >> 12) & 15)) -eq 3 ]; then
HAVE_BOOTLOADER_EEPROM=1
fi
if [ "${HAVE_BOOTLOADER_EEPROM}" != 1 ]; then
return
fi
# vcgencmd doesn't return non-zero for unknown commands.
if vcgencmd bootloader_config | grep -qi "Command not registered"; then
# Firmware is too old to return the bootloader config
return
fi
# If FREEZE_VERSION is specified then assume that the user doesn't want
# an EEPROM update so skip the check.
if vcgencmd bootloader_config | grep -q FREEZE_VERSION=1; then
return
fi
if vcgencmd bootloader_version | grep -q timestamp; then
CURRENT_VERSION=$(vcgencmd bootloader_version | grep timestamp | awk '{print $2}')
if [ "${CURRENT_VERSION}" = "0" ]; then
# If a timestamp of zero is returned then it's new firmware but an
# old bootloader. Assume bootloader v0
CURRENT_VERSION="${FIRST_VERSION}"
fi
else
# New bootloader / old firmware ? Try to parse the date
CURRENT_VERSION=$(date -u +%s --date "$(vcgencmd bootloader_version | head -n1)")
fi
# Failed to parse the version. Default to the initial production release.
if [ -z "${CURRENT_VERSION}" ]; then
CURRENT_VERSION="${FIRST_VERSION}"
fi
if [ "${CURRENT_VERSION}" -lt "${MIN_VERSION}" ]; then
echo "A newer bootloader EEPROM version is available."
echo "On Debian, try: sudo apt update; sudo apt install rpi-eeprom"
echo "then reboot to install the new bootloader"
fi
}
function show_notice { function show_notice {
local NOTICE_URI=${REPO_CONTENT_URI}/${FW_REV}/NOTICE.md local NOTICE_URI=${REPO_CONTENT_URI}/${FW_REV}/NOTICE.md
local FULL_NOTICE=$(eval curl -fs ${CURL_OPTIONS} "${NOTICE_URI}") local FULL_NOTICE=$(eval curl -fs ${CURL_OPTIONS} "${NOTICE_URI}")
@@ -332,6 +393,7 @@ function do_update {
if [[ ${WANT_PI4} -eq 1 ]]; then if [[ ${WANT_PI4} -eq 1 ]]; then
check_partition check_partition
fi fi
check_eeprom_version
show_notice show_notice
download_rev download_rev
if [[ -f "${FW_REPOLOCAL}/pre-install" ]]; then if [[ -f "${FW_REPOLOCAL}/pre-install" ]]; then