diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2013-11-28 16:44:51 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-05-01 15:39:26 +0200 |
| commit | ab56b3b11c34b5315fadc2147f5d1a860dccc419 (patch) | |
| tree | 9ef7fe2cb506240b40f9da73392c0fe8b3c93bd9 /src/device | |
| parent | 926a8d1262c09fda9868f73cf0241140ccf09ec9 (diff) | |
| download | coreboot-ab56b3b11c34b5315fadc2147f5d1a860dccc419.tar.xz | |
ChromeOS: Remove oprom_is_loaded
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 <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/4309
Tested-by: build bot (Jenkins)
Reviewed-by: Aaron Durbin <adurbin@google.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/device')
| -rw-r--r-- | src/device/pci_device.c | 11 |
1 files changed, 3 insertions, 8 deletions
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 <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> +#include <bootmode.h> #include <delay.h> #if CONFIG_HYPERTRANSPORT_PLUGIN_SUPPORT #include <device/hypertransport.h> @@ -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 */ } |