CONFIG_PCI_ROM_RUN
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1875 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
diff --git a/src/devices/pci_device.c b/src/devices/pci_device.c
index 8bd6ec8..4aef222 100644
--- a/src/devices/pci_device.c
+++ b/src/devices/pci_device.c
@@ -551,10 +551,12 @@
{
uint16_t ctrl;
+#if CONFIG_CONSOLE_VGA == 1
/* enable IO in command register if there is VGA card
* connected with (even it does not claim IO resource) */
if (dev->link[0].bridge_ctrl & PCI_BRIDGE_CTL_VGA)
dev->command |= PCI_COMMAND_IO;
+#endif
ctrl = pci_read_config16(dev, PCI_BRIDGE_CONTROL);
ctrl |= dev->link[0].bridge_ctrl;
@@ -573,6 +575,7 @@
((device & 0xffff) << 16) | (vendor & 0xffff));
}
+#if CONFIG_PCI_ROM_RUN == 1
void pci_dev_init(struct device *dev)
{
struct rom_header *rom, *ram;
@@ -581,9 +584,12 @@
if (rom == NULL)
return;
ram = pci_rom_load(dev, rom);
+ if (ram == NULL)
+ return;
run_bios(dev, ram);
}
+#endif
/** Default device operation for PCI devices */
static struct pci_operations pci_dev_ops_pci = {
@@ -594,7 +600,11 @@
.read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources,
+#if CONFIG_PCI_ROM_RUN == 1
.init = pci_dev_init,
+#else
+ .init = 0,
+#endif
.scan_bus = 0,
.enable = 0,
.ops_pci = &pci_dev_ops_pci,