[coreboot] r666 - in coreboot-v3: device mainboard/emulation/qemu-x86

[svn at coreboot.org]

Author: stepan
Date: 2008-04-24 22:45:57 +0200 (Thu, 24 Apr 2008)
New Revision: 666

Modified:
   coreboot-v3/device/pci_rom.c
   coreboot-v3/mainboard/emulation/qemu-x86/vga.c
Log:
Fix vga initialization for qemu virtual graphics adapter.

Signed-off-by: Stefan Reinauer <stepan at coresystems.de>
Acked-by: Myles Watson <mylesgw at gmail.com>



Modified: coreboot-v3/device/pci_rom.c
===================================================================
--- coreboot-v3/device/pci_rom.c	2008-04-19 14:29:56 UTC (rev 665)
+++ coreboot-v3/device/pci_rom.c	2008-04-24 20:45:57 UTC (rev 666)
@@ -61,7 +61,13 @@
 		rom_address = 0xc0000;
 
 	} else {
-		rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS);
+		if (dev->rom_address) {
+			/* Override in place? */
+			rom_address = dev->rom_address;
+		} else {
+			rom_address = pci_read_config32(dev, PCI_ROM_ADDRESS) & 0xfffffffe;
+		}
+
 	}
 
 	if (rom_address == 0x00000000 || rom_address == 0xffffffff) {

Modified: coreboot-v3/mainboard/emulation/qemu-x86/vga.c
===================================================================
--- coreboot-v3/mainboard/emulation/qemu-x86/vga.c	2008-04-19 14:29:56 UTC (rev 665)
+++ coreboot-v3/mainboard/emulation/qemu-x86/vga.c	2008-04-24 20:45:57 UTC (rev 666)
@@ -33,7 +33,6 @@
 
 	printk(BIOS_INFO, "Init VGA device\n");
 
-	dev->on_mainboard = 1;
 	dev->rom_address = 0xc0000;
 
 	/*