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

Add the timestamp of the update to the pieeprom.sig file.

Browse Source 
Add the timestamp to pieeprom.sig for use with a future bootloader
update.

This is not relevant for the VL805 firmware because it is not
configurable.
This commit is contained in:
Tim Gover
2020-10-17 13:32:57 +01:00
parent f24abcd305
commit 7612907337
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rpi-eeprom-config
View File

@@ -22,6 +22,9 @@ MAX_BOOTCONF_SIZE = 2024
# The number, order and size of the sections depends on the bootloader version # The number, order and size of the sections depends on the bootloader version
# but the following mask can be used to test for section headers and skip # but the following mask can be used to test for section headers and skip
# unknown data. # unknown data.
#
# The last 4KB of the EEPROM image is reserved for internal use by the
# bootloader and may be overwritten during the update process.
MAGIC = 0x55aaf00f MAGIC = 0x55aaf00f
MAGIC_MASK = 0xfffff00f MAGIC_MASK = 0xfffff00f
FILE_MAGIC = 0x55aaf11f # id for modifiable file, currently only bootconf.txt FILE_MAGIC = 0x55aaf11f # id for modifiable file, currently only bootconf.txt

21
rpi-eeprom-update
View File

@@ -151,9 +151,15 @@ applyRecoveryUpdate()
# A '.sig' file is created so that recovery.bin can check that the # A '.sig' file is created so that recovery.bin can check that the
# EEPROM image has not been created (e.g. SD card corruption). # EEPROM image has not been created (e.g. SD card corruption).
# The .sig file format is currently just a SHA256 in ASCII hex. In future, # Format of the .sig file.
# if an actual public key signature is required then that plus any other # --
# data would be appended after the SHA256 signature. # SHA256\n
# ts: UPDATE-TIMESTAMP\n
# --
# SHA256 is a 64 character hex string
# UPDATE-TIMESTAMP is an unsigned decimal.
#
# The 'filename' output from sha256 MUST be omitted.
if [ -n "${BOOTLOADER_UPDATE_IMAGE}" ]; then if [ -n "${BOOTLOADER_UPDATE_IMAGE}" ]; then
[ -f "${BOOTLOADER_UPDATE_IMAGE}" ] || die "${BOOTLOADER_UPDATE_IMAGE} not found" [ -f "${BOOTLOADER_UPDATE_IMAGE}" ] || die "${BOOTLOADER_UPDATE_IMAGE} not found"
@@ -167,6 +173,15 @@ applyRecoveryUpdate()
sha256sum "${TMP_EEPROM_IMAGE}" | awk '{print $1}' > "${BOOTFS}/pieeprom.sig" \ sha256sum "${TMP_EEPROM_IMAGE}" | awk '{print $1}' > "${BOOTFS}/pieeprom.sig" \
|| die "Failed to create ${BOOTFS}/pieeprom.sig" || die "Failed to create ${BOOTFS}/pieeprom.sig"
# Appends the update creation timestamp on a newline in pieeprom.sig
# During an self-update mode the bootloader examines the update timestamp
# and # will only update itself if it is newer than than the current update
# timestamp.
#
# The update-timestamp is indendent of the bootloader version and
# and does not have to be timestamp.
echo "ts: $(date -u +%s)" >> "${BOOTFS}/pieeprom.sig"
cp -f "${TMP_EEPROM_IMAGE}" "${BOOTFS}/pieeprom.upd" \ cp -f "${TMP_EEPROM_IMAGE}" "${BOOTFS}/pieeprom.upd" \
|| die "Failed to copy ${TMP_EEPROM_IMAGE} to ${BOOTFS}" || die "Failed to copy ${TMP_EEPROM_IMAGE} to ${BOOTFS}"