diff options
| author | Duncan Laurie <dlaurie@chromium.org> | 2014-11-19 14:14:07 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-13 12:22:18 +0200 |
| commit | 2a5c8f0bc48990d58b6e4475d658852ce836c5fc (patch) | |
| tree | fc104a0412579d954f5f5a5c6f5960ea83df5a21 /src/vendorcode/google/chromeos | |
| parent | efae69a4ef9455a8f2cd5afac7b3448ba298536e (diff) | |
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
Change-Id: Id432dc154736baa799d9ddf5a6a25bccc66217ef
Signed-off-by: Stefan Reinauer <reinauer@chromium.org>
Original-Commit-Id: 8a576b0bf4b912f85a4e82bfe2cf13c838a069cc
Original-Signed-off-by: Duncan Laurie <dlaurie@chromium.org>
Original-Change-Id: I6968fcb6cda74e88f56bea6ea9bbf77cc795b8d6
Original-Reviewed-on: https://chromium-review.googlesource.com/230887
Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/9559
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'src/vendorcode/google/chromeos')
| -rw-r--r-- | src/vendorcode/google/chromeos/vboot1/vboot_loader.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/vendorcode/google/chromeos/vboot1/vboot_loader.c b/src/vendorcode/google/chromeos/vboot1/vboot_loader.c index 97ca902006..a2972621d3 100644 --- a/src/vendorcode/google/chromeos/vboot1/vboot_loader.c +++ b/src/vendorcode/google/chromeos/vboot1/vboot_loader.c @@ -234,6 +234,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()) { |