aboutsummaryrefslogtreecommitdiff
path: root/src/device/pci_device.c
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2013-12-20 17:47:19 +0100
committerVladimir Serbinenko <phcoder@gmail.com>2013-12-24 14:40:49 +0100
commitb32816e9a5564e3604c3829b92727b54356f4777 (patch)
treee903e61e25651a410426a08df203d193d99f6166 /src/device/pci_device.c
parent50ecb9c11131a31bc6f0d0e0b5fcbd5aab36e5e0 (diff)
Remove PCI_ROM_RUN option
The main purpose of option rom is to supply int* handlers. But supplying those is outside of coreboot scope and if someone needs those they should run SeaBIOS anyway which runs the option roms wonderfully. Running VGA oprom is kept because they're needed to init graphics. This patch still keeps the options to include the option roms to make them available to SeaBIOS. Change-Id: I646334cf88094d3bf8f527779a68a07e0b4b93ec Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/4545 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/device/pci_device.c')
-rw-r--r--src/device/pci_device.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/device/pci_device.c b/src/device/pci_device.c
index c810483649..aa0d954480 100644
--- a/src/device/pci_device.c
+++ b/src/device/pci_device.c
@@ -666,15 +666,11 @@ int oprom_is_loaded = 0;
/** Default handler: only runs the relevant PCI BIOS. */
void pci_dev_init(struct device *dev)
{
-#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
+#if CONFIG_VGA_ROM_RUN
struct rom_header *rom, *ram;
- if (CONFIG_PCI_ROM_RUN != 1 && /* Only execute VGA ROMs. */
- ((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA))
- return;
-
- if (CONFIG_VGA_ROM_RUN != 1 && /* Only execute non-VGA ROMs. */
- ((dev->class >> 8) == PCI_CLASS_DISPLAY_VGA))
+ /* Only execute VGA ROMs. */
+ if (((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA))
return;
#if CONFIG_CHROMEOS
@@ -711,7 +707,7 @@ void pci_dev_init(struct device *dev)
oprom_is_loaded = 1;
printk(BIOS_DEBUG, "VGA Option ROM has been loaded\n");
#endif
-#endif /* CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN */
+#endif /* CONFIG_VGA_ROM_RUN */
}
/** Default device operation for PCI devices */