commit 0325dc6f7cbdad4fd29315bfcb7f4e54fb678f3e
author Furquan Shaikh <furquan@google.com> Mon Jul 25 13:02:36 2016 -0700
committer Furquan Shaikh <furquan@google.com> Thu Jul 28 00:36:22 2016 +0200
tree c227dd6bba0827e4072cf60ffb60401960af4546
parent 2a12e2e8da2477d97b8774babd1a74dda65d11a0

bootmode: Get rid of CONFIG_BOOTMODE_STRAPS

With VBOOT_VERIFY_FIRMWARE separated from CHROMEOS, move recovery and
developer mode check functions to vboot. Thus, get rid of the
BOOTMODE_STRAPS option which controlled these functions under src/lib.

BUG=chrome-os-partner:55639

Change-Id: Ia2571026ce8976856add01095cc6be415d2be22e
Signed-off-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://review.coreboot.org/15868
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

src/device/pci_device.c

diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index 73558db..05d4051 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -669,8 +669,7 @@
 	/* Don't run VGA option ROMs, unless we have to print
 	 * something on the screen before the kernel is loaded.
 	 */
-	should_run = !IS_ENABLED(CONFIG_BOOTMODE_STRAPS) ||
-		developer_mode_enabled() || recovery_mode_enabled();
+	should_run = display_init_required();
 
 #if CONFIG_CHROMEOS
 	if (!should_run)