[coreboot] [commit] r5778 - trunk/src/mainboard/emulation/qemu-x86

[repository service]

Author: myles
Date: Mon Sep  6 22:20:47 2010
New Revision: 5778
URL: https://tracker.coreboot.org/trac/coreboot/changeset/5778

Log:
Update RoadRunner and SpaceRunner config to get in sync with current
standard BIOSes RRLX0013 and SRLX0013.  Specifically move SPI and PME
I/Os to 0x1228 and 0x298 and switch SIO watchdog to ext. 48 MHz CLKIN.

Signed-off-by: Jens Rottmann 
Acked-by: Myles Watson

Modified:
   trunk/src/mainboard/emulation/qemu-x86/mainboard.c

Modified: trunk/src/mainboard/emulation/qemu-x86/mainboard.c
==============================================================================
--- trunk/src/mainboard/emulation/qemu-x86/mainboard.c	Sun Sep  5 07:52:33 2010	(r5777)
+++ trunk/src/mainboard/emulation/qemu-x86/mainboard.c	Mon Sep  6 22:20:47 2010	(r5778)
@@ -10,15 +10,15 @@
 /* not sure how these are routed in qemu */
 static const unsigned char enetIrqs[4] = { 11, 0, 0, 0 };

-static void qemu_init(device_t dev)
+static void qemu_nb_init(device_t dev)
 {
-	/* The VGA OPROM already lives at 0xc0000,
-	 * force coreboot to use it.
-	 */
-	dev->on_mainboard = 1;
-
-	/* Now do the usual initialization */
-	pci_dev_init(dev);
+	/* Map memory at 0xc0000 - 0xfffff */
+	int i;
+	uint8_t v = pci_read_config8(dev, 0x59);
+	v |= 0x30;
+	pci_write_config8(dev, 0x59, v);
+	for (i=0; i<6; i++)
+	pci_write_config8(dev, 0x5a + i, 0x33);

/* This sneaked in here, because Qemu does not
     * emulate a SuperIO chip
@@ -32,6 +32,31 @@
    pci_assign_irqs(0, 3, enetIrqs);
 }

+static struct device_operations nb_operations = {
+ 	.read_resources   = pci_dev_read_resources,
+ 	.set_resources    = pci_dev_set_resources,
+ 	.enable_resources = pci_dev_enable_resources,
+ 	.init             = qemu_nb_init,
+	.ops_pci          = 0,
+};
+
+static const struct pci_driver nb_driver __pci_driver = {
+	.ops = &nb_operations,
+	.vendor = 0x8086,
+	.device = 0x1237,
+};
+
+static void qemu_init(device_t dev)
+{
+	/* The VGA OPROM already lives at 0xc0000,
+	 * force coreboot to use it.
+	 */
+	dev->on_mainboard = 1;
+
+	/* Now do the usual initialization */
+	pci_dev_init(dev);
+}
+
 static struct device_operations vga_operations = {
    .read_resources   = pci_dev_read_resources,
    .set_resources    = pci_dev_set_resources,