From 8c67b276650307a41ea861082c5ef583107e0588 Mon Sep 17 00:00:00 2001 From: Tim Gover Date: Fri, 1 Mar 2024 09:27:01 +0000 Subject: [PATCH] rpi-eeprom-update: Only check for flashrom during an update There's no need to check for flashrom when querying the current version, removing pending updates etc. See: https://github.com/raspberrypi/rpi-eeprom/issues/548 --- rpi-eeprom-update | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rpi-eeprom-update b/rpi-eeprom-update index b0cb02f..2e1cbc4 100755 --- a/rpi-eeprom-update +++ b/rpi-eeprom-update @@ -410,10 +410,12 @@ checkDependencies() { # Default to off - in the future Raspberry Pi 5 may default to using flashrom if # flashrom is available. - [ -z "${RPI_EEPROM_USE_FLASHROM}" ] && RPI_EEPROM_USE_FLASHROM=0 - if [ "${RPI_EEPROM_USE_FLASHROM}" -eq 1 ] && ! command -v flashrom > /dev/null; then - warn "WARNING: flashrom not found. Setting RPI_EEPROM_USE_FLASHROM to 0" - RPI_EEPROM_USE_FLASHROM=0 + if [ "${AUTO_UPDATE_BOOTLOADER}" = 1 ] || [ -n "${BOOTLOADER_UPDATE_IMAGE}" ]; then + [ -z "${RPI_EEPROM_USE_FLASHROM}" ] && RPI_EEPROM_USE_FLASHROM=0 + if [ "${RPI_EEPROM_USE_FLASHROM}" -eq 1 ] && ! command -v flashrom > /dev/null; then + warn "WARNING: flashrom not found. Setting RPI_EEPROM_USE_FLASHROM to 0" + RPI_EEPROM_USE_FLASHROM=0 + fi fi FIRMWARE_IMAGE_DIR="${FIRMWARE_ROOT}-${BCM_CHIP}/${FIRMWARE_RELEASE_STATUS}"