[coreboot-gerrit] New patch to review for coreboot: e78c474 Honor vboot's request to load the VGA option ROM

[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/4125

-gerrit

commit e78c47401a629a46311dadac42cb9162c8e728a8
Author: Bill Richardson <wfrichar at chromium.org>
Date:   Tue Jul 10 17:54:59 2012 -0700

    Honor vboot's request to load the VGA option ROM
    
    This removes an earlier patch that caused the VGA option ROM to be loaded by
    coreboot even in normal mode when it isn't needed.
    
    Change-Id: Ie0a331a10fff212a2394e7234a0dbb37570607b7
    Signed-off-by: Bill Richardson <wfrichar at chromium.org>
    Reviewed-on: https://gerrit.chromium.org/gerrit/48173
    Commit-Queue: Stefan Reinauer <reinauer at google.com>
    Reviewed-by: Stefan Reinauer <reinauer at google.com>
    Tested-by: Stefan Reinauer <reinauer at google.com>
---
 src/vendorcode/google/chromeos/vbnv.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/vendorcode/google/chromeos/vbnv.c b/src/vendorcode/google/chromeos/vbnv.c
index 58ccbdb..a13726d 100644
--- a/src/vendorcode/google/chromeos/vbnv.c
+++ b/src/vendorcode/google/chromeos/vbnv.c
@@ -143,11 +143,5 @@ int vboot_wants_oprom(void)
 	if (!is_vbnv_initialized())
 		vbnv_setup();
 
-	/* FIXME(crosbug.com/p/8789). The following commented-out line does the
-	 * right thing, assuming that vboot has requested the option ROM and
-	 * rebooted if it finds that it's needed but not loaded. At the moment,
-	 * it doesn't yet do that, so we must always say we want it. */
-
-	/* return (vbnv_data(BOOT_OFFSET) & BOOT_OPROM_NEEDED) ? 1 : 0; */
-	return 1;
+	return (vbnv_data(BOOT_OFFSET) & BOOT_OPROM_NEEDED) ? 1 : 0;
 }