futility: updater: Stop looking for zephyr.bin
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>
diff --git a/futility/updater_manifest.c b/futility/updater_manifest.c
index cb18434..0760cb9 100644
--- a/futility/updater_manifest.c
+++ b/futility/updater_manifest.c
@@ -386,13 +386,13 @@
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 @@
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);
}
