futility: updater: Clean up hard-coded section names to preserve
The following sections can be now deleted from hard-coded list:
- RO_PRESERVE: no boards use it.
- RO_FSG: new images have set the PRESERVE flag in CBFS.
- SI_GBE, SI_PDR: already using PRESERVE flag since fw branch is cut.
BUG=b:116326638,chromium:936768
TEST=make clean && make runtests
Change-Id: I99759949104bf4f1c1db3556e273923dcb1c5887
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/1902841
Tested-by: Hung-Te Lin <hungte@chromium.org>
Auto-Submit: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Commit-Queue: Hung-Te Lin <hungte@chromium.org>
diff --git a/futility/updater.c b/futility/updater.c
index a360f2c..25b20a7 100644
--- a/futility/updater.c
+++ b/futility/updater.c
@@ -1088,24 +1088,12 @@
{
int errcnt = 0, i;
const char * const names[] = {
- "RO_PRESERVE",
- "RW_PRESERVE",
+ "RW_PRESERVE", /* Only octopus fw branch is using this. */
"RO_VPD",
"RW_VPD",
"SMMSTORE",
"RW_NVRAM",
"RW_ELOG",
- /*
- * TODO(hungte): b/116326638: Remove RO_FSG after the migration
- * is finished.
- */
- "RO_FSG",
- /*
- * TODO(hungte): crbug.com/936768: Remove SI_GBE, SI_PDR after
- * both migrated to the new FMAP based preserve method.
- */
- "SI_GBE",
- "SI_PDR",
};
for (i = 0; i < ARRAY_SIZE(names); i++) {