[coreboot-gerrit] New patch to review for coreboot: 92c0821 vboot1: Set BEFORE_OPROM_LOAD flag for VbInit()

[Stefan Reinauer (stefan.reinauer@coreboot.org)]

Stefan Reinauer (stefan.reinauer at coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/9559

-gerrit

commit 92c08213119e3e8c31756d417e56e3754ecd3cdc
Author: Duncan Laurie <dlaurie at chromium.org>
Date:   Wed Nov 19 14:14:07 2014 -0800

    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 at chromium.org>
    Original-Commit-Id: 8a576b0bf4b912f85a4e82bfe2cf13c838a069cc
    Original-Signed-off-by: Duncan Laurie <dlaurie at chromium.org>
    Original-Change-Id: I6968fcb6cda74e88f56bea6ea9bbf77cc795b8d6
    Original-Reviewed-on: https://chromium-review.googlesource.com/230887
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
---
 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 97ca902..a297262 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()) {