From 606c5d25e562fb0f88e934bf53102ccfa62d025b Mon Sep 17 00:00:00 2001 From: Shogo Yamazaki Date: Sun, 4 Feb 2024 11:50:06 +0900 Subject: [PATCH] Print warning when flashrom is not found, instead of silently ignoring it --- rpi-eeprom-update | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rpi-eeprom-update b/rpi-eeprom-update index a85cbb7..9f630b3 100755 --- a/rpi-eeprom-update +++ b/rpi-eeprom-update @@ -404,6 +404,10 @@ 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 + echo "WARNING: flashrom not found. Setting RPI_EEPROM_USE_FLASHROM to 0" + RPI_EEPROM_USE_FLASHROM=0 + fi FIRMWARE_IMAGE_DIR="${FIRMWARE_ROOT}-${BCM_CHIP}/${FIRMWARE_RELEASE_STATUS}" if ! [ -d "${FIRMWARE_IMAGE_DIR}" ]; then @@ -483,10 +487,6 @@ checkDependencies() { if [ "${BCM_CHIP}" = 2711 ] && [ ! -f "${RECOVERY_BIN}" ]; then die "${RECOVERY_BIN} not found." fi - - if ! command -v flashrom > /dev/null; then - RPI_EEPROM_USE_FLASHROM=0 - fi } usage() {