From ab56b3b11c34b5315fadc2147f5d1a860dccc419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Thu, 28 Nov 2013 16:44:51 +0200 Subject: ChromeOS: Remove oprom_is_loaded MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A global flag oprom_is_loaded was used to indicate to U-boot that VGA option ROM was loaded and run, or that native VGA init was completed on GMA device. Implement this feature without dependency to CHROMEOS option and replace use of global variable oprom_is_loaded with call to gfx_get_init_done(). Change-Id: I7e1afd752f18e5346dabdee62e4f7ea08ada5faf Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/4309 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Reviewed-by: Paul Menzel --- src/device/pci_device.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/device') diff --git a/src/device/pci_device.c b/src/device/pci_device.c index ca3604611d..dfc08987e7 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #if CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT #include @@ -660,10 +661,6 @@ void pci_dev_set_subsystem(struct device *dev, unsigned vendor, unsigned device) ((device & 0xffff) << 16) | (vendor & 0xffff)); } -#if CONFIG_CHROMEOS -int oprom_is_loaded = 0; -#endif - #if CONFIG_VGA_ROM_RUN static int should_run_oprom(struct device *dev) { @@ -733,10 +730,8 @@ void pci_dev_init(struct device *dev) return; run_bios(dev, (unsigned long)ram); -#if CONFIG_CHROMEOS - oprom_is_loaded = 1; - printk(BIOS_DEBUG, "VGA Option ROM has been loaded\n"); -#endif + gfx_set_init_done(1); + printk(BIOS_DEBUG, "VGA Option ROM was run\n"); #endif /* CONFIG_VGA_ROM_RUN */ } -- cgit v1.2.3