From ed86d5e1447f48720b9438ad7b51dd720097e575 Mon Sep 17 00:00:00 2001 From: andrum99 <58046090+andrum99@users.noreply.github.com> Date: Wed, 3 Jun 2020 17:13:33 +0100 Subject: [PATCH 1/3] rpi-eeprom-update - fix description of -d flag --- rpi-eeprom-update | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rpi-eeprom-update b/rpi-eeprom-update index 7a9b649..07ccf93 100755 --- a/rpi-eeprom-update +++ b/rpi-eeprom-update @@ -351,10 +351,14 @@ in /etc/default/rpi-eeprom-update by defining the BOOTFS variable. A backup of the current EEPROM config file is written to ${FIRMWARE_BACKUP_DIR} before applying the update. +Unless the -d flag is specified, the current bootloader configuration is +retained. + Options: -a Automatically install bootloader and USB (VLI) EEPROM updates. -A Specify which type of EEPROM to automatically update (vl805 or bootloader) - -d Use the default bootloader config instead of migrating the current settings + -d Use the default bootloader config, or if a file is specified using the -f + flag use the config in that file. -f Install the given file instead of the latest applicable update Ignores the FREEZE_VERSION flag in bootloader and is intended for manual firmware updates. From 7cf2828046a1322d3eda221cb1b9b00d2c9067c8 Mon Sep 17 00:00:00 2001 From: andrum99 <58046090+andrum99@users.noreply.github.com> Date: Wed, 3 Jun 2020 17:24:29 +0100 Subject: [PATCH 2/3] Clarify -d option when EEPROM update not needed --- rpi-eeprom-update | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rpi-eeprom-update b/rpi-eeprom-update index 07ccf93..7eca39a 100755 --- a/rpi-eeprom-update +++ b/rpi-eeprom-update @@ -358,7 +358,9 @@ Options: -a Automatically install bootloader and USB (VLI) EEPROM updates. -A Specify which type of EEPROM to automatically update (vl805 or bootloader) -d Use the default bootloader config, or if a file is specified using the -f - flag use the config in that file. + flag use the config in that file. This option only applies in the case of + a bootloader EEPROM update - it has no effect when there is no update + needed. -f Install the given file instead of the latest applicable update Ignores the FREEZE_VERSION flag in bootloader and is intended for manual firmware updates. From beceaab7ae05cd125c723960306edc476b5a0f96 Mon Sep 17 00:00:00 2001 From: andrum99 <58046090+andrum99@users.noreply.github.com> Date: Wed, 3 Jun 2020 17:26:03 +0100 Subject: [PATCH 3/3] reword --- rpi-eeprom-update | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rpi-eeprom-update b/rpi-eeprom-update index 7eca39a..fc9cfd5 100755 --- a/rpi-eeprom-update +++ b/rpi-eeprom-update @@ -358,9 +358,9 @@ Options: -a Automatically install bootloader and USB (VLI) EEPROM updates. -A Specify which type of EEPROM to automatically update (vl805 or bootloader) -d Use the default bootloader config, or if a file is specified using the -f - flag use the config in that file. This option only applies in the case of - a bootloader EEPROM update - it has no effect when there is no update - needed. + flag use the config in that file. This option only applies when a + bootloader EEPROM update is needed; if the bootloader EEPROM is up-to-date + then its config will not be changed. -f Install the given file instead of the latest applicable update Ignores the FREEZE_VERSION flag in bootloader and is intended for manual firmware updates.