GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Vladimir Serbinenko 2013-12-20 17:47:19 +01:00
parent 50ecb9c111
commit b32816e9a5
33 changed files with 61 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/device/Kconfig
View File

@ -66,23 +66,6 @@ config S3_VGA_ROM_RUN
If unsure, say N when using SeaBIOS as payload, Y otherwise. If unsure, say N when using SeaBIOS as payload, Y otherwise.
config PCI_ROM_RUN
bool "Run non-VGA Option ROMs"
default n if PAYLOAD_SEABIOS
default y if !PAYLOAD_SEABIOS
depends on PCI && !PAYLOAD_SEABIOS || EXPERT
help
Execute non-VGA PCI Option ROMs in coreboot if found.
Examples include IDE/SATA controller Option ROMs and Option ROMs
for network cards (NICs).
When using a SeaBIOS payload it runs all option ROMs with much
more complete BIOS interrupt services available than coreboot,
which some option ROMs require in order to function correctly.
If unsure, say N when using SeaBIOS as payload, Y otherwise.
config ON_DEVICE_ROM_RUN config ON_DEVICE_ROM_RUN
bool "Run Option ROMs on PCI devices" bool "Run Option ROMs on PCI devices"
default n if PAYLOAD_SEABIOS default n if PAYLOAD_SEABIOS
@ -106,7 +89,7 @@ choice
prompt "Option ROM execution type" prompt "Option ROM execution type"
default PCI_OPTION_ROM_RUN_YABEL if !ARCH_X86 default PCI_OPTION_ROM_RUN_YABEL if !ARCH_X86
default PCI_OPTION_ROM_RUN_REALMODE if ARCH_X86 default PCI_OPTION_ROM_RUN_REALMODE if ARCH_X86
depends on PCI_ROM_RUN || VGA_ROM_RUN || GEODE_VSA depends on VGA_ROM_RUN || GEODE_VSA
config PCI_OPTION_ROM_RUN_REALMODE config PCI_OPTION_ROM_RUN_REALMODE
prompt "Native mode" prompt "Native mode"

4
src/device/Makefile.inc
View File

@ -17,9 +17,5 @@ romstage-y+= device_romstage.c
subdirs-y += oprom subdirs-y += oprom
ifeq ($(CONFIG_PCI_ROM_RUN),y)
ramstage-y += pci_rom.c
else
ramstage-$(CONFIG_VGA_ROM_RUN) += pci_rom.c ramstage-$(CONFIG_VGA_ROM_RUN) += pci_rom.c
endif

12
src/device/pci_device.c
View File

@ -666,15 +666,11 @@ int oprom_is_loaded = 0;
/** Default handler: only runs the relevant PCI BIOS. */ /** Default handler: only runs the relevant PCI BIOS. */
void pci_dev_init(struct device *dev) 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; struct rom_header *rom, *ram;
if (CONFIG_PCI_ROM_RUN != 1 && /* Only execute VGA ROMs. */ /* Only execute VGA ROMs. */
((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA)) if (((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))
return; return;
#if CONFIG_CHROMEOS #if CONFIG_CHROMEOS
@ -711,7 +707,7 @@ void pci_dev_init(struct device *dev)
oprom_is_loaded = 1; oprom_is_loaded = 1;
printk(BIOS_DEBUG, "VGA Option ROM has been loaded\n"); printk(BIOS_DEBUG, "VGA Option ROM has been loaded\n");
#endif #endif
#endif /* CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN */ #endif /* CONFIG_VGA_ROM_RUN */
} }
/** Default device operation for PCI devices */ /** Default device operation for PCI devices */

4
src/mainboard/amd/dinar/Kconfig
View File

@ -169,10 +169,6 @@ config ONBOARD_LIGHTSENSOR
bool bool
default n default n
config PCI_ROM_RUN
bool
default n
config UDELAY_IO config UDELAY_IO
bool bool
default n default n

6
src/mainboard/google/bolt/mainboard.c
View File

@ -26,7 +26,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -45,7 +45,7 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res = 0; int res = 0;
@ -189,7 +189,7 @@ static void mainboard_enable(device_t dev)
{ {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = mainboard_smbios_data; dev->ops->get_smbios_data = mainboard_smbios_data;
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/google/butterfly/mainboard.c
View File

@ -24,7 +24,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -195,7 +195,7 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res = 0; int res = 0;
@ -381,7 +381,7 @@ static void mainboard_enable(device_t dev)
{ {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = butterfly_onboard_smbios_data; dev->ops->get_smbios_data = butterfly_onboard_smbios_data;
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/google/falco/mainboard.c
View File

@ -26,7 +26,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -45,7 +45,7 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res = 0; int res = 0;
@ -189,7 +189,7 @@ static void mainboard_enable(device_t dev)
{ {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = mainboard_smbios_data; dev->ops->get_smbios_data = mainboard_smbios_data;
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/google/link/mainboard.c
View File

@ -25,7 +25,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -61,7 +61,7 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res = 0; int res = 0;
@ -222,7 +222,7 @@ static void mainboard_enable(device_t dev)
{ {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = link_onboard_smbios_data; dev->ops->get_smbios_data = link_onboard_smbios_data;
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/google/parrot/mainboard.c
View File

@ -24,7 +24,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -49,7 +49,7 @@ void mainboard_suspend_resume(void)
outb(0xe1, 0xb2); outb(0xe1, 0xb2);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res = 0; int res = 0;
@ -191,7 +191,7 @@ static void mainboard_enable(device_t dev)
{ {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = parrot_onboard_smbios_data; dev->ops->get_smbios_data = parrot_onboard_smbios_data;
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/google/peppy/mainboard.c
View File

@ -26,7 +26,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -45,7 +45,7 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res = 0; int res = 0;
@ -189,7 +189,7 @@ static void mainboard_enable(device_t dev)
{ {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = mainboard_smbios_data; dev->ops->get_smbios_data = mainboard_smbios_data;
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/google/slippy/mainboard.c
View File

@ -26,7 +26,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -45,7 +45,7 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res = 0; int res = 0;
@ -189,7 +189,7 @@ static void mainboard_enable(device_t dev)
{ {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = mainboard_smbios_data; dev->ops->get_smbios_data = mainboard_smbios_data;
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/google/stout/mainboard.c
View File

@ -24,7 +24,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -49,7 +49,7 @@ void mainboard_suspend_resume(void)
ec_write_cmd(EC_CMD_NOTIFY_ACPI_ENTER); ec_write_cmd(EC_CMD_NOTIFY_ACPI_ENTER);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res = 0; int res = 0;
@ -174,7 +174,7 @@ static void mainboard_init(device_t dev)
static void mainboard_enable(device_t dev) static void mainboard_enable(device_t dev)
{ {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/ibase/mb899/mainboard.c
View File

@ -20,14 +20,14 @@
#include <types.h> #include <types.h>
#include <device/device.h> #include <device/device.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <arch/io.h> #include <arch/io.h>
#include <arch/interrupt.h> #include <arch/interrupt.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
#define BOOT_DISPLAY_DEFAULT 0 #define BOOT_DISPLAY_DEFAULT 0
@ -214,7 +214,7 @@ static void verb_setup(void)
static void mainboard_enable(device_t dev) static void mainboard_enable(device_t dev)
{ {
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/intel/baskingridge/mainboard.c
View File

@ -25,7 +25,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -42,7 +42,7 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res = 0; int res = 0;
@ -144,7 +144,7 @@ static void verb_setup(void)
static void mainboard_enable(device_t dev) static void mainboard_enable(device_t dev)
{ {
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

4
src/mainboard/intel/cougar_canyon2/mainboard.c
View File

@ -25,7 +25,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -44,7 +44,7 @@ void mainboard_suspend_resume(void)
} }
#endif #endif
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res=0; int res=0;

6
src/mainboard/intel/emeraldlake2/mainboard.c
View File

@ -25,7 +25,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -42,7 +42,7 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res=0; int res=0;
@ -156,7 +156,7 @@ static void verb_setup(void)
static void mainboard_enable(device_t dev) static void mainboard_enable(device_t dev)
{ {
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/intel/wtm2/mainboard.c
View File

@ -25,7 +25,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -42,7 +42,7 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res = 1; int res = 1;
@ -144,7 +144,7 @@ static void verb_setup(void)
static void mainboard_enable(device_t dev) static void mainboard_enable(device_t dev)
{ {
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/kontron/986lcd-m/mainboard.c
View File

@ -20,7 +20,7 @@
#include <types.h> #include <types.h>
#include <device/device.h> #include <device/device.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -37,7 +37,7 @@
#define BOOT_DISPLAY_EFP2 (1 << 6) #define BOOT_DISPLAY_EFP2 (1 << 6)
#define BOOT_DISPLAY_LCD2 (1 << 7) #define BOOT_DISPLAY_LCD2 (1 << 7)
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
/* This int15 handler is Intel IGD. specific. Other chipsets need other /* This int15 handler is Intel IGD. specific. Other chipsets need other
@ -221,7 +221,7 @@ static void verb_setup(void)
static void mainboard_enable(device_t dev) static void mainboard_enable(device_t dev)
{ {
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

4
src/mainboard/kontron/ktqm77/mainboard.c
View File

@ -25,7 +25,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -42,7 +42,7 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res = 0; int res = 0;

4
src/mainboard/msi/ms9652_fam10/Kconfig
View File

@ -101,10 +101,6 @@ config CONSOLE_SERIAL8250
bool bool
default y default y
config PCI_ROM_RUN
bool
default y
config USBDEBUG config USBDEBUG
bool bool
default n default n

6
src/mainboard/roda/rk886ex/mainboard.c
View File

@ -24,7 +24,7 @@
#include <arch/io.h> #include <arch/io.h>
#include <arch/interrupt.h> #include <arch/interrupt.h>
#include <delay.h> #include <delay.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
@ -60,7 +60,7 @@ static void backlight_enable(void)
#define BOOT_DISPLAY_EFP2 (1 << 6) #define BOOT_DISPLAY_EFP2 (1 << 6)
#define BOOT_DISPLAY_LCD2 (1 << 7) #define BOOT_DISPLAY_LCD2 (1 << 7)
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
/* This int15 handler is Intel IGD. specific. Other chipsets need other /* This int15 handler is Intel IGD. specific. Other chipsets need other
@ -124,7 +124,7 @@ static void mainboard_enable(device_t dev)
/* Disable Dummy DCC -> GP45 = 1 */ /* Disable Dummy DCC -> GP45 = 1 */
outb(inb(0x60f) | (1 << 5), 0x60f); outb(inb(0x60f) | (1 << 5), 0x60f);
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/samsung/lumpy/mainboard.c
View File

@ -24,7 +24,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -49,7 +49,7 @@ void mainboard_suspend_resume(void)
send_ec_command(EC_ACPI_ENABLE); send_ec_command(EC_ACPI_ENABLE);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res=0; int res=0;
@ -206,7 +206,7 @@ static void mainboard_enable(device_t dev)
{ {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
dev->ops->get_smbios_data = lumpy_onboard_smbios_data; dev->ops->get_smbios_data = lumpy_onboard_smbios_data;
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/samsung/stumpy/mainboard.c
View File

@ -25,7 +25,7 @@
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
#include <console/console.h> #include <console/console.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
@ -42,7 +42,7 @@ void mainboard_suspend_resume(void)
outb(0xcb, 0xb2); outb(0xcb, 0xb2);
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
int res=0; int res=0;
@ -147,7 +147,7 @@ static void verb_setup(void)
static void mainboard_enable(device_t dev) static void mainboard_enable(device_t dev)
{ {
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

6
src/mainboard/thomson/ip1000/mainboard.c
View File

@ -21,7 +21,7 @@
#include <console/console.h> #include <console/console.h>
#include <device/device.h> #include <device/device.h>
#include <delay.h> #include <delay.h>
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h> #include <x86emu/x86emu.h>
#endif #endif
#include <arch/io.h> #include <arch/io.h>
@ -87,7 +87,7 @@ static void flash_gpios(void)
} }
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
static int int15_handler(void) static int int15_handler(void)
{ {
#define BOOT_DISPLAY_DEFAULT 0 #define BOOT_DISPLAY_DEFAULT 0
@ -142,7 +142,7 @@ static void mainboard_init(device_t dev)
static void mainboard_enable(device_t dev) static void mainboard_enable(device_t dev)
{ {
dev->ops->init = mainboard_init; dev->ops->init = mainboard_init;
#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN #if CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */ /* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler); mainboard_interrupt_handlers(0x15, &int15_handler);
#endif #endif

5
src/southbridge/amd/sb600/ide.c
View File

@ -44,11 +44,6 @@ static void ide_init(struct device *dev)
dword = pci_read_config16(dev, 0x4); dword = pci_read_config16(dev, 0x4);
dword |= 1 << 2; dword |= 1 << 2;
pci_write_config16(dev, 0x4, dword); pci_write_config16(dev, 0x4, dword);
#if CONFIG_PCI_ROM_RUN
pci_dev_init(dev);
#endif
} }
static struct pci_operations lops_pci = { static struct pci_operations lops_pci = {

4
src/southbridge/amd/sb700/ide.c
View File

@ -59,10 +59,6 @@ static void ide_init(struct device *dev)
byte |= 1 << 4; byte |= 1 << 4;
pci_write_config8(sm_dev, 0xAD, byte); pci_write_config8(sm_dev, 0xAD, byte);
} }
#if CONFIG_PCI_ROM_RUN
pci_dev_init(dev);
#endif
} }
static struct pci_operations lops_pci = { static struct pci_operations lops_pci = {

4
src/southbridge/amd/sb800/ide.c
View File

@ -57,10 +57,6 @@ static void ide_init(struct device *dev)
byte |= 1 << 4; byte |= 1 << 4;
pci_write_config8(dev, 0xAD, byte); pci_write_config8(dev, 0xAD, byte);
} }
#if CONFIG_PCI_ROM_RUN
pci_dev_init(dev);
#endif
} }
static struct pci_operations lops_pci = { static struct pci_operations lops_pci = {

9
src/southbridge/broadcom/bcm5780/nic.c
View File

@ -24,13 +24,6 @@
#include <device/pci_ids.h> #include <device/pci_ids.h>
#include <device/pci_ops.h> #include <device/pci_ops.h>
static void nic_init(struct device *dev)
{
#if CONFIG_PCI_ROM_RUN
pci_dev_init(dev);// it will init option rom
#endif
}
static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device) static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned device)
{ {
@ -46,7 +39,7 @@ static struct device_operations nic_ops = {
.read_resources = pci_dev_read_resources, .read_resources = pci_dev_read_resources,
.set_resources = pci_dev_set_resources, .set_resources = pci_dev_set_resources,
.enable_resources = pci_dev_enable_resources, .enable_resources = pci_dev_enable_resources,
.init = nic_init, .init = pci_dev_init,
.scan_bus = 0, .scan_bus = 0,
.ops_pci = &lops_pci, .ops_pci = &lops_pci,
}; };

4
src/southbridge/nvidia/ck804/ide.c
View File

@ -59,10 +59,6 @@ static void ide_init(struct device *dev)
dword = pci_read_config32(dev, 0xf8); dword = pci_read_config32(dev, 0xf8);
dword |= 12; dword |= 12;
pci_write_config32(dev, 0xf8, dword); pci_write_config32(dev, 0xf8, dword);
#if CONFIG_PCI_ROM_RUN
pci_dev_init(dev);
#endif
} }
static struct device_operations ide_ops = { static struct device_operations ide_ops = {

4
src/southbridge/nvidia/ck804/nic.c
View File

@ -107,10 +107,6 @@ static void nic_init(struct device *dev)
#endif #endif
nic_index++; nic_index++;
#if CONFIG_PCI_ROM_RUN
pci_dev_init(dev); /* It will init Option ROM. */
#endif
} }
static struct device_operations nic_ops = { static struct device_operations nic_ops = {

3
src/southbridge/nvidia/mcp55/ide.c
View File

@ -61,9 +61,6 @@ static void ide_init(struct device *dev)
dword = pci_read_config32(dev, 0xf8); dword = pci_read_config32(dev, 0xf8);
dword |= 12; dword |= 12;
pci_write_config32(dev, 0xf8, dword); pci_write_config32(dev, 0xf8, dword);
#if CONFIG_PCI_ROM_RUN
pci_dev_init(dev);
#endif
} }
static struct device_operations ide_ops = { static struct device_operations ide_ops = {

5
src/southbridge/nvidia/mcp55/nic.c
View File

@ -179,11 +179,6 @@ static void nic_init(struct device *dev)
#endif #endif
nic_index++; nic_index++;
#if CONFIG_PCI_ROM_RUN
pci_dev_init(dev);// it will init option rom
#endif
} }
static struct device_operations nic_ops = { static struct device_operations nic_ops = {

3
src/southbridge/sis/sis966/ide.c
View File

@ -144,9 +144,6 @@ print_debug("IDE_INIT:---------->\n");
dword = pci_read_config32(dev, 0xf8); dword = pci_read_config32(dev, 0xf8);
dword |= 12; dword |= 12;
pci_write_config32(dev, 0xf8, dword); pci_write_config32(dev, 0xf8, dword);
#if CONFIG_PCI_ROM_RUN
pci_dev_init(dev);
#endif
#if DEBUG_IDE #if DEBUG_IDE
{ {