diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2023-04-28 11:36:21 +1000 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2023-05-05 22:37:21 +0000 |
| commit | ff86b93483c7d7b5b6991177068232f94b32e0de (patch) | |
| tree | 8ad014367e404c780428391874dd2a318a42f32e /futility/updater_manifest.c | |
| parent | 8ef4f7a9a9a68bad49e8417d5ed346dc927e1d2c (diff) | |
| download | vboot-ff86b93483c7d7b5b6991177068232f94b32e0de.tar.gz | |
futility/: EOL PD firmware updating support
The kunimitsu/glados family uses a PD MCU. These include lars, sentry,
caroline, and chell. The kunimitsu family reaches AUE 2023-Jun-01. As
part of removing cros_ec out of flashrom drop which support for this
subtype so then EOL it from futility too.
BUG=b:262782150,b:280268486
BRANCH=none
TEST=`cros_run_unit_tests --board=nissa --packages="vboot_reference flashrom"`.
Cq-Depend: chromium:4453124, chromium:4486860
Change-Id: I111492c7386dec012419cb0581e302e7e1f1719e
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4486657
Reviewed-by: Sam McNally <sammc@chromium.org>
Auto-Submit: Edward O'Callaghan <quasisec@chromium.org>
Tested-by: Edward O'Callaghan <quasisec@chromium.org>
Diffstat (limited to 'futility/updater_manifest.c')
| -rw-r--r-- | futility/updater_manifest.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/futility/updater_manifest.c b/futility/updater_manifest.c index 188f5ffb..71dd783f 100644 --- a/futility/updater_manifest.c +++ b/futility/updater_manifest.c @@ -60,7 +60,6 @@ static const char * const SETVARS_IMAGE_MAIN = "IMAGE_MAIN", * const SETVARS_IMAGE_EC = "IMAGE_EC", - * const SETVARS_IMAGE_PD = "IMAGE_PD", * const SETVARS_SIGNATURE_ID = "SIGNATURE_ID", * const SIG_ID_IN_VPD_PREFIX = "sig-id-in", * const DIR_KEYSET = "keyset", @@ -166,8 +165,6 @@ static int model_config_parse_setvars_file( cfg->image = strdup(v); else if (strcmp(k, SETVARS_IMAGE_EC) == 0) cfg->ec_image = strdup(v); - else if (strcmp(k, SETVARS_IMAGE_PD) == 0) - cfg->pd_image = strdup(v); else if (strcmp(k, SETVARS_SIGNATURE_ID) == 0) { cfg->signature_id = strdup(v); if (str_startswith(v, SIG_ID_IN_VPD_PREFIX)) @@ -374,17 +371,12 @@ static int manifest_scan_entries(const char *name, void *arg) return 0; } - /* In legacy setvars.sh, the ec_image and pd_image may not exist. */ + /* In legacy setvars.sh, the ec_image may not exist. */ if (model.ec_image && !archive_has_entry(archive, model.ec_image)) { VB2_DEBUG("Ignore non-exist EC image: %s\n", model.ec_image); free(model.ec_image); model.ec_image = NULL; } - if (model.pd_image && !archive_has_entry(archive, model.pd_image)) { - VB2_DEBUG("Ignore non-exist PD image: %s\n", model.pd_image); - free(model.pd_image); - model.pd_image = NULL; - } /* Find patch files. */ if (model.signature_id) @@ -574,8 +566,7 @@ static int manifest_from_simple_folder(struct manifest *manifest) { const char * const host_image_name = "image.bin", * const old_host_image_name = "bios.bin", - * const ec_name = "ec.bin", - * const pd_name = "pd.bin"; + * const ec_name = "ec.bin"; struct u_archive *archive = manifest->archive; const char *image_name = NULL; struct firmware_image image = {0}; @@ -592,8 +583,6 @@ static int manifest_from_simple_folder(struct manifest *manifest) model.image = strdup(image_name); if (archive_has_entry(archive, ec_name)) model.ec_image = strdup(ec_name); - if (archive_has_entry(archive, pd_name)) - model.pd_image = strdup(pd_name); /* Extract model name from FWID: $Vendor_$Platform.$Version */ if (!load_firmware_image(&image, image_name, archive)) { char *token = NULL; @@ -868,7 +857,6 @@ void delete_manifest(struct manifest *manifest) free(model->signature_id); free(model->image); free(model->ec_image); - free(model->pd_image); clear_patch_config(&model->patches); } free(manifest->models); @@ -940,7 +928,6 @@ void print_json_manifest(const struct manifest *manifest) } images[] = { {"host", m->image, true}, {"ec", m->ec_image}, - {"pd", m->pd_image}, }; bool is_first = true; printf("%s%*s\"%s\": {\n", i ? ",\n" : "", indent, "", m->name); |