diff options
| author | Yu-Ping Wu <yupingso@chromium.org> | 2022-08-01 11:46:34 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-08-07 07:14:44 +0000 |
| commit | 67f613b922e4ccff6019de318c154a377afbe822 (patch) | |
| tree | 13350f1d92d867a643e89ff2eac4e50ed31c18ab | |
| parent | 7d3dd82630e7505fe2804551c61e12e08c9fae4e (diff) | |
| download | vboot-stabilize-15032.B.tar.gz | |
futility: updater: Stop looking for zephyr.binstabilize-15033.Bstabilize-15032.B
In CL:3788136 the zephyr EC image is renamed from zephyr.bin to ec.bin.
Therefore we don't need to check the existence of zephyr.bin anymore.
BUG=b:239887568
TEST=make runtests -j
BRANCH=none
Cq-Depend: chromium:3788136
Change-Id: Icd82baff93d2019cfd90b982e9c25b45cbf611c3
Signed-off-by: Yu-Ping Wu <yupingso@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/3795458
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Yidi Lin <yidilin@chromium.org>
| -rw-r--r-- | futility/updater_manifest.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/futility/updater_manifest.c b/futility/updater_manifest.c index cb18434c..0760cb99 100644 --- a/futility/updater_manifest.c +++ b/futility/updater_manifest.c @@ -386,13 +386,13 @@ static int manifest_scan_raw_entries(const char *name, void *arg) struct manifest *manifest = (struct manifest *)arg; struct u_archive *archive = manifest->archive; struct model_config model = {0}; - char *ec_name = NULL, *zephyr_name = NULL; + char *ec_name = NULL; int chars_read = 0; /* * /build/$BOARD/firmware (or CPFE firmware archives) layout: * - image-${MODEL}{,.serial,.dev...}.bin - * - ${MODEL}/ec.bin or ${MODEL}/zephyr.bin + * - ${MODEL}/ec.bin */ if (sscanf(name, "image-%m[^.].bin%n", &model.name, &chars_read) != 1) @@ -408,13 +408,9 @@ static int manifest_scan_raw_entries(const char *name, void *arg) model.image = strdup(name); ASPRINTF(&ec_name, "%s/ec.bin", model.name); - ASPRINTF(&zephyr_name, "%s/zephyr.bin", model.name); if (archive_has_entry(archive, ec_name)) model.ec_image = strdup(ec_name); - else if (archive_has_entry(archive, zephyr_name)) - model.ec_image = strdup(zephyr_name); free(ec_name); - free(zephyr_name); return !manifest_add_model(manifest, &model); } |