diff options
| -rw-r--r-- | futility/cmd_gbb_utility.c | 6 | ||||
| -rw-r--r-- | futility/updater.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/futility/cmd_gbb_utility.c b/futility/cmd_gbb_utility.c index 95c1a47d..08b6591f 100644 --- a/futility/cmd_gbb_utility.c +++ b/futility/cmd_gbb_utility.c @@ -417,7 +417,11 @@ static void teardown_flash(struct updater_config *cfg, static uint8_t *read_from_flash(struct updater_config *cfg, off_t *filesize) { #ifdef USE_FLASHROM - const char * const regions[] = {FMAP_RO_GBB, NULL}; + /* + * Read the FMAP region as well, so that a subsequet write won't + * require another read of FMAP. + */ + const char * const regions[] = {FMAP_RO_FMAP, FMAP_RO_GBB, NULL}; if (flashrom_read_image(&cfg->image_current, regions, cfg->verbosity + 1)) return NULL; diff --git a/futility/updater.h b/futility/updater.h index 788bf65f..3d04cb4e 100644 --- a/futility/updater.h +++ b/futility/updater.h @@ -12,7 +12,8 @@ #include "updater_utils.h" /* FMAP section names. */ -static const char * const FMAP_RO_FRID = "RO_FRID", +static const char * const FMAP_RO_FMAP = "FMAP", + * const FMAP_RO_FRID = "RO_FRID", * const FMAP_RO_SECTION = "RO_SECTION", * const FMAP_RO_CBFS = "COREBOOT", * const FMAP_RO_GBB = "GBB", |