diff options
author | Edward O'Callaghan <quasisec@google.com> | 2022-12-19 15:11:48 +1100 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-03-26 09:31:45 +0000 |
commit | 64e9aec36289ade7e7372e41a4e599d86948a97a (patch) | |
tree | eca526e87b653d6727678e9965381461fcfbea85 | |
parent | 3fb4566c02e4152f3edaad773238e8e8dc09695e (diff) | |
download | vboot-64e9aec36289ade7e7372e41a4e599d86948a97a.tar.gz |
futility: Drop external flashrom quark
This prevents architectural changes required to make futility to
make it fast and robust while providing limited to no tangible
value.
BUG=b:226477133
BRANCH=none
TEST=none
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Change-Id: Ie0ea715fcf60cfb5b2b25037f4421c2dc70c0e5b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4147407
Reviewed-by: Sam McNally <sammc@chromium.org>
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
-rw-r--r-- | futility/updater.h | 1 | ||||
-rw-r--r-- | futility/updater_quirks.c | 5 | ||||
-rw-r--r-- | futility/updater_utils.c | 58 |
3 files changed, 1 insertions, 63 deletions
diff --git a/futility/updater.h b/futility/updater.h index 1b371f9c..a4d1f1fa 100644 --- a/futility/updater.h +++ b/futility/updater.h @@ -52,7 +52,6 @@ enum quirk_types { QUIRK_NO_CHECK_PLATFORM, QUIRK_NO_VERIFY, QUIRK_EXTRA_RETRIES, - QUIRK_EXTERNAL_FLASHROM, QUIRK_CLEAR_MRC_DATA, QUIRK_MAX, }; diff --git a/futility/updater_quirks.c b/futility/updater_quirks.c index aadb9e72..49b35caa 100644 --- a/futility/updater_quirks.c +++ b/futility/updater_quirks.c @@ -556,11 +556,6 @@ void updater_register_quirks(struct updater_config *cfg) quirks->help = "Extra retries when writing to system firmware."; quirks->apply = NULL; /* Simple config. */ - quirks = &cfg->quirks[QUIRK_EXTERNAL_FLASHROM]; - quirks->name = "external_flashrom"; - quirks->help = "Use external flashrom to access the system firmware."; - quirks->apply = NULL; /* Simple config. */ - quirks = &cfg->quirks[QUIRK_CLEAR_MRC_DATA]; quirks->name = "clear_mrc_data"; quirks->help = "b/255617349: Clear memory training data (MRC)."; diff --git a/futility/updater_utils.c b/futility/updater_utils.c index 2be63902..90d9d554 100644 --- a/futility/updater_utils.c +++ b/futility/updater_utils.c @@ -583,72 +583,16 @@ static char *get_flashrom_command(enum flash_command flash_cmd, return cmd; } -static int external_flashrom(enum flash_command flash_cmd, - struct flashrom_params *params, - struct tempfile *tempfiles) -{ - int r; - char *cmd; - const char *image_name = NULL, *contents_name = NULL; - - switch (flash_cmd) { - case FLASH_READ: - image_name = create_temp_file(tempfiles); - break; - - case FLASH_WRITE: - image_name = get_firmware_image_temp_file( - params->image, tempfiles); - if (params->flash_contents) - contents_name = get_firmware_image_temp_file( - params->flash_contents, tempfiles); - break; - - default: - ERROR("Unknown command: %d\n", flash_cmd); - return -1; - } - - cmd = get_flashrom_command(flash_cmd, params, image_name, - contents_name); - if (!cmd) - return -1; - - VB2_DEBUG(cmd); - r = system(cmd); - free(cmd); - if (r) - return r; - - switch (flash_cmd) { - case FLASH_READ: - r = load_firmware_image(params->image, image_name, NULL); - break; - default: - break; - } - - return r; -} - static int read_flash(struct flashrom_params *params, struct updater_config *cfg) { - if (get_config_quirk(QUIRK_EXTERNAL_FLASHROM, cfg)) - return external_flashrom(FLASH_READ, params, &cfg->tempfiles); - return flashrom_read_image(params->image, NULL, params->verbose); } static int write_flash(struct flashrom_params *params, struct updater_config *cfg) { - int r; - - if (get_config_quirk(QUIRK_EXTERNAL_FLASHROM, cfg)) - return external_flashrom(FLASH_WRITE, params, &cfg->tempfiles); - - r = flashrom_write_image(params->image, + int r = flashrom_write_image(params->image, params->regions, params->flash_contents, !params->noverify, |