summaryrefslogtreecommitdiff
path: root/src/device
diff options
context:
space:
mode:
authorJoel Kitching <kitching@google.com>2019-05-10 12:58:53 +0800
committerPatrick Georgi <pgeorgi@google.com>2019-05-15 17:50:08 +0000
commit807803afa2d10cfd818d7f1585e0279f09fc1e14 (patch)
treea1981475a24b9fc3c50222fd4b8584a24f72c905 /src/device
parent18b51b7315bea0031f05f14dcad82857716d264e (diff)
downloadcoreboot-807803afa2d10cfd818d7f1585e0279f09fc1e14.tar.xz
vboot: remove OPROM-related code
As of CL:1605641, vboot2 code should be used for setting and checking display init state. Remove all vboot1 OPROM-related code, and use the vboot2 display init code which has already been added in previous commits. coreboot should not be reading vboot NVRAM flags directly. Remove the function vboot_wants_oprom(), and instead rely on display_init_required(), which uses the VBOOT_WD_FLAG_DISPLAY_INIT value stored in vboot_working_data.flags, initialized during verstage. Note that this means in the case of CONFIG_VBOOT=y, the return value of display_init_required() can only be trusted after verstage has been executed. This should not be a problem assuming that all display initialization occurs in ramstage. BUG=b:124141368, b:124192753, chromium:948529 TEST=Build locally TEST=make clean && make test-abuild BRANCH=none Change-Id: Ic8f9dc5a3c7f1546a8fed82bde02be4d04568f8d Signed-off-by: Joel Kitching <kitching@google.com> Cq-Depend: chromium:1605641, chromium:1605525 Reviewed-on: https://review.coreboot.org/c/coreboot/+/32723 Reviewed-by: Furquan Shaikh <furquan@google.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Julius Werner <jwerner@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/device')
-rw-r--r--src/device/pci_device.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index b5453c7e76..31c35dc02e 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -780,9 +780,6 @@ static int should_run_oprom(struct device *dev)
*/
should_run = display_init_required();
- if (!should_run && CONFIG(VBOOT))
- should_run = vboot_wants_oprom();
-
if (!should_run)
printk(BIOS_DEBUG, "Not running VGA Option ROM\n");
return should_run;