summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Benn <evanbenn@chromium.org>2023-01-18 15:33:02 +1100
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-01-27 10:13:54 +0000
commit52f28a4b68aa018fff3cc575610bc9c1c04a030f (patch)
treeb7ba676717ca1fa2a26b1f3107afdce3be979a78
parent4bdc8e9c0a6db487acb5f5eb60635016710cb438 (diff)
downloadvboot-stabilize-15335.B.tar.gz
futility: gbb: Read only the GBB region from flashstabilize-15335.B
BUG=b:265861606 BRANCH=None TEST=futility gbb --get --flash --flags --hwid --digest --rootkey=/tmp/rootkey --bmpfv=/tmp/bmpfv --recoverykey=/tmp/recoverykey TEST=futility gbb --get --flags --hwid --digest --rootkey=/tmp/rootkey2 --bmpfv=/tmp/bmpfv2 --recoverykey=/tmp/recoverykey2 /tmp/bios TEST=diff the above TEST=confirm that it is quicker (3s vs 26s on one dut) Change-Id: I398e40a1cc50a6921e0385277fc03d0b7fa7c9b8 Signed-off-by: Evan Benn <evanbenn@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/4170147 Reviewed-by: Edward O'Callaghan <quasisec@chromium.org> Tested-by: Edward O'Callaghan <quasisec@chromium.org> Reviewed-by: Julius Werner <jwerner@chromium.org>
-rw-r--r--futility/cmd_gbb_utility.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/futility/cmd_gbb_utility.c b/futility/cmd_gbb_utility.c
index b40cceda..a34e9aa4 100644
--- a/futility/cmd_gbb_utility.c
+++ b/futility/cmd_gbb_utility.c
@@ -417,7 +417,8 @@ static void teardown_flash(struct updater_config *cfg,
static uint8_t *read_from_flash(struct updater_config *cfg, off_t *filesize)
{
#ifdef USE_FLASHROM
- if (load_system_firmware(cfg, &cfg->image_current))
+ if (flashrom_read_image(&cfg->image_current, FMAP_RO_GBB,
+ cfg->verbosity + 1))
return NULL;
uint8_t *ret = cfg->image_current.data;
cfg->image_current.data = NULL;