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

rpi-eeprom-update: Get bootloader build-timestamp from device-tree

Browse Source
This commit is contained in:
Tim Gover
2021-01-07 21:33:22 +00:00
parent b481076132
commit 289befb382
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rpi-eeprom-update
View File

@@ -34,6 +34,8 @@ BOOTFS=${BOOTFS:-/boot}
VCMAILBOX=${VCMAILBOX:-/opt/vc/bin/vcmailbox} VCMAILBOX=${VCMAILBOX:-/opt/vc/bin/vcmailbox}
CM4_ENABLE_RPI_EEPROM_UPDATE=${CM4_ENABLE_RPI_EEPROM_UPDATE:-0} CM4_ENABLE_RPI_EEPROM_UPDATE=${CM4_ENABLE_RPI_EEPROM_UPDATE:-0}
DT_BOOTLOADER_TS=${DT_BOOTLOADER_TS:-/proc/device-tree/chosen/bootloader/build-timestamp}
EXIT_SUCCESS=0 EXIT_SUCCESS=0
EXIT_UPDATE_REQUIRED=1 EXIT_UPDATE_REQUIRED=1
EXIT_FAILED=2 EXIT_FAILED=2
@@ -267,7 +269,10 @@ applyUpdate() {
# this via flashrom to avoid unnecessary audio glitches. # this via flashrom to avoid unnecessary audio glitches.
BOOTLOADER_CURRENT_VERSION= BOOTLOADER_CURRENT_VERSION=
getBootloaderCurrentVersion() { getBootloaderCurrentVersion() {
if vcgencmd bootloader_version | grep -q timestamp; then if [ -f "${DT_BOOTLOADER_TS}" ]; then
# Prefer device-tree to vcgencmd
BOOTLOADER_CURRENT_VERSION=$(printf "%d" "0x$(od "${DT_BOOTLOADER_TS}" -v -An -t x1 | tr -d ' ' )")
elif vcgencmd bootloader_version | grep -q timestamp; then
BOOTLOADER_CURRENT_VERSION=$(vcgencmd bootloader_version | grep timestamp | awk '{print $2}') BOOTLOADER_CURRENT_VERSION=$(vcgencmd bootloader_version | grep timestamp | awk '{print $2}')
if [ "${BOOTLOADER_CURRENT_VERSION}" = "0" ]; then if [ "${BOOTLOADER_CURRENT_VERSION}" = "0" ]; then
# If a timestamp of zero is returned then it's new firmware but an # If a timestamp of zero is returned then it's new firmware but an
@@ -332,8 +337,12 @@ checkDependencies() {
HAVE_VL805_EEPROM=0 HAVE_VL805_EEPROM=0
fi fi
if ! command -v vcgencmd > /dev/null; then # vcgencmd bootloader_version is deprecated. Use device-tree if available to
die "vcgencmd not found. On Debian, try installing the libraspberrypi-bin package." # reduce the number of dependencies on VCHI.
if ! [ -f "${DT_BOOTLOADER_TS}" ]; then
if ! command -v vcgencmd > /dev/null; then
die "vcgencmd not found. On Debian, try installing the libraspberrypi-bin package."
fi
fi fi
if [ ! -d "${FIRMWARE_IMAGE_DIR}" ]; then if [ ! -d "${FIRMWARE_IMAGE_DIR}" ]; then