diff options
author | Yinghai Lu <yinghailu@gmail.com> | 2005-01-17 21:37:12 +0000 |
---|---|---|
committer | Yinghai Lu <yinghailu@gmail.com> | 2005-01-17 21:37:12 +0000 |
commit | 1f1085b433187f64f3d12961faad6e745a42c286 (patch) | |
tree | f1cc14ef4fcb4cbba459edea7e57e06f495714c5 /src/devices/pci_rom.c | |
parent | c507e4de737108b6acb022ffd1a0b5678ea8062e (diff) | |
download | coreboot-1f1085b433187f64f3d12961faad6e745a42c286.tar.xz |
linkb_to_host and addon display card override onboard card.
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1880 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices/pci_rom.c')
-rw-r--r-- | src/devices/pci_rom.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/pci_rom.c b/src/devices/pci_rom.c index 310c00f00c..92f0b0980f 100644 --- a/src/devices/pci_rom.c +++ b/src/devices/pci_rom.c @@ -57,6 +57,7 @@ static void *pci_ram_image_start = PCI_RAM_IMAGE_START; #if CONFIG_CONSOLE_VGA == 1 int vga_inited = 0; // it will be used by vga_console +extern device_t vga_pri; // The only VGA #endif struct rom_header *pci_rom_load(struct device *dev, struct rom_header *rom_header) @@ -71,7 +72,7 @@ struct rom_header *pci_rom_load(struct device *dev, struct rom_header *rom_heade if (PCI_CLASS_DISPLAY_VGA == (rom_data->class_hi << 16 | rom_data->class_lo)) { #if CONFIG_CONSOLE_VGA == 1 - if(vga_inited) return NULL; // only one VGA supported + if (dev != vga_pri) return NULL; // only one VGA supported printk_spew("%s, copying VGA ROM Image from %x to %x, %x bytes\n", __func__, rom_header, PCI_VGA_RAM_IMAGE_START, rom_size); memcpy(PCI_VGA_RAM_IMAGE_START, rom_header, rom_size); |