From 8a576b0bf4b912f85a4e82bfe2cf13c838a069cc Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Wed, 19 Nov 2014 14:14:07 -0800 Subject: [PATCH] vboot1: Set BEFORE_OPROM_LOAD flag for VbInit() This sets the new VB_INIT_FLAG_BEFORE_OPROM_LOAD flag for VbInit() to indicate that we are running from early firmware before option rom loading has occurred so it can do the right thing when it checks whether or not to tell the system to reboot after setting the VbNv flag. BUG=chrome-os-partner:32379 BRANCH=samus TEST=pass FAFT tests on samus Signed-off-by: Duncan Laurie Change-Id: I6968fcb6cda74e88f56bea6ea9bbf77cc795b8d6 Reviewed-on: https://chromium-review.googlesource.com/230887 Reviewed-by: Aaron Durbin --- src/vendorcode/google/chromeos/vboot1/vboot_loader.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/vendorcode/google/chromeos/vboot1/vboot_loader.c b/src/vendorcode/google/chromeos/vboot1/vboot_loader.c index 7745ee47b4..5b168fffb6 100644 --- a/src/vendorcode/google/chromeos/vboot1/vboot_loader.c +++ b/src/vendorcode/google/chromeos/vboot1/vboot_loader.c @@ -235,6 +235,7 @@ static void vboot_invoke_wrapper(struct vboot_handoff *vboot_handoff) *iflags |= VB_INIT_FLAG_EC_SLOW_UPDATE; if (CONFIG_VBOOT_OPROM_MATTERS) { *iflags |= VB_INIT_FLAG_OPROM_MATTERS; + *iflags |= VB_INIT_FLAG_BEFORE_OPROM_LOAD; /* Will load VGA option rom during this boot */ if (developer_mode_enabled() || recovery_mode_enabled() || vboot_wants_oprom()) {