diff options
Diffstat (limited to 'src/mainboard')
21 files changed, 55 insertions, 63 deletions
diff --git a/src/mainboard/amd/dinar/Kconfig b/src/mainboard/amd/dinar/Kconfig index 441357bdb5..488eb34085 100644 --- a/src/mainboard/amd/dinar/Kconfig +++ b/src/mainboard/amd/dinar/Kconfig @@ -169,10 +169,6 @@ config ONBOARD_LIGHTSENSOR bool default n -config PCI_ROM_RUN - bool - default n - config UDELAY_IO bool default n diff --git a/src/mainboard/google/bolt/mainboard.c b/src/mainboard/google/bolt/mainboard.c index 3bf26e3f21..d4213017cc 100644 --- a/src/mainboard/google/bolt/mainboard.c +++ b/src/mainboard/google/bolt/mainboard.c @@ -26,7 +26,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -45,7 +45,7 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res = 0; @@ -189,7 +189,7 @@ static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/google/butterfly/mainboard.c b/src/mainboard/google/butterfly/mainboard.c index eb7d363c9c..1623fe01c6 100644 --- a/src/mainboard/google/butterfly/mainboard.c +++ b/src/mainboard/google/butterfly/mainboard.c @@ -24,7 +24,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -195,7 +195,7 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res = 0; @@ -381,7 +381,7 @@ static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/google/falco/mainboard.c b/src/mainboard/google/falco/mainboard.c index 3bf26e3f21..d4213017cc 100644 --- a/src/mainboard/google/falco/mainboard.c +++ b/src/mainboard/google/falco/mainboard.c @@ -26,7 +26,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -45,7 +45,7 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res = 0; @@ -189,7 +189,7 @@ static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/google/link/mainboard.c b/src/mainboard/google/link/mainboard.c index 08b1c02a96..9c63acd182 100644 --- a/src/mainboard/google/link/mainboard.c +++ b/src/mainboard/google/link/mainboard.c @@ -25,7 +25,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -61,7 +61,7 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res = 0; @@ -222,7 +222,7 @@ static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/google/parrot/mainboard.c b/src/mainboard/google/parrot/mainboard.c index 34cb24e87e..56a1b47b63 100644 --- a/src/mainboard/google/parrot/mainboard.c +++ b/src/mainboard/google/parrot/mainboard.c @@ -24,7 +24,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -49,7 +49,7 @@ void mainboard_suspend_resume(void) outb(0xe1, 0xb2); } -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res = 0; @@ -191,7 +191,7 @@ static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/google/peppy/mainboard.c b/src/mainboard/google/peppy/mainboard.c index 3bf26e3f21..d4213017cc 100644 --- a/src/mainboard/google/peppy/mainboard.c +++ b/src/mainboard/google/peppy/mainboard.c @@ -26,7 +26,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -45,7 +45,7 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res = 0; @@ -189,7 +189,7 @@ static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/google/slippy/mainboard.c b/src/mainboard/google/slippy/mainboard.c index 3bf26e3f21..d4213017cc 100644 --- a/src/mainboard/google/slippy/mainboard.c +++ b/src/mainboard/google/slippy/mainboard.c @@ -26,7 +26,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -45,7 +45,7 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res = 0; @@ -189,7 +189,7 @@ static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/google/stout/mainboard.c b/src/mainboard/google/stout/mainboard.c index 7f6b7ddd07..8cd2fbd8c0 100644 --- a/src/mainboard/google/stout/mainboard.c +++ b/src/mainboard/google/stout/mainboard.c @@ -24,7 +24,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -49,7 +49,7 @@ void mainboard_suspend_resume(void) 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) { int res = 0; @@ -174,7 +174,7 @@ static void mainboard_init(device_t dev) static void mainboard_enable(device_t dev) { 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/ibase/mb899/mainboard.c b/src/mainboard/ibase/mb899/mainboard.c index 373edaec19..f6d2456b9a 100644 --- a/src/mainboard/ibase/mb899/mainboard.c +++ b/src/mainboard/ibase/mb899/mainboard.c @@ -20,14 +20,14 @@ #include <types.h> #include <device/device.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> #include <arch/io.h> #include <arch/interrupt.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { #define BOOT_DISPLAY_DEFAULT 0 @@ -214,7 +214,7 @@ static void verb_setup(void) 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/intel/baskingridge/mainboard.c b/src/mainboard/intel/baskingridge/mainboard.c index 69943cb036..42c96b2837 100644 --- a/src/mainboard/intel/baskingridge/mainboard.c +++ b/src/mainboard/intel/baskingridge/mainboard.c @@ -25,7 +25,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -42,7 +42,7 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res = 0; @@ -144,7 +144,7 @@ static void verb_setup(void) 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/intel/cougar_canyon2/mainboard.c b/src/mainboard/intel/cougar_canyon2/mainboard.c index 60b0b0d2e0..e7dda026dd 100644 --- a/src/mainboard/intel/cougar_canyon2/mainboard.c +++ b/src/mainboard/intel/cougar_canyon2/mainboard.c @@ -25,7 +25,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -44,7 +44,7 @@ void mainboard_suspend_resume(void) } #endif -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res=0; diff --git a/src/mainboard/intel/emeraldlake2/mainboard.c b/src/mainboard/intel/emeraldlake2/mainboard.c index 5f7d224b32..f995697e55 100644 --- a/src/mainboard/intel/emeraldlake2/mainboard.c +++ b/src/mainboard/intel/emeraldlake2/mainboard.c @@ -25,7 +25,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -42,7 +42,7 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res=0; @@ -156,7 +156,7 @@ static void verb_setup(void) 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/intel/wtm2/mainboard.c b/src/mainboard/intel/wtm2/mainboard.c index e7650fa46d..5aecffc94e 100644 --- a/src/mainboard/intel/wtm2/mainboard.c +++ b/src/mainboard/intel/wtm2/mainboard.c @@ -25,7 +25,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -42,7 +42,7 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res = 1; @@ -144,7 +144,7 @@ static void verb_setup(void) 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c index f4e1a24b22..ce0d5de253 100644 --- a/src/mainboard/kontron/986lcd-m/mainboard.c +++ b/src/mainboard/kontron/986lcd-m/mainboard.c @@ -20,7 +20,7 @@ #include <types.h> #include <device/device.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -37,7 +37,7 @@ #define BOOT_DISPLAY_EFP2 (1 << 6) #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) { /* 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) { -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN /* Install custom int15 handler for VGA OPROM */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c index 30f0468ef3..b3dec205b7 100644 --- a/src/mainboard/kontron/ktqm77/mainboard.c +++ b/src/mainboard/kontron/ktqm77/mainboard.c @@ -25,7 +25,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -42,7 +42,7 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res = 0; diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig index b6baac372b..33aab77b23 100644 --- a/src/mainboard/msi/ms9652_fam10/Kconfig +++ b/src/mainboard/msi/ms9652_fam10/Kconfig @@ -101,10 +101,6 @@ config CONSOLE_SERIAL8250 bool default y -config PCI_ROM_RUN - bool - default y - config USBDEBUG bool default n diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c index 9504701d77..a792d5b072 100644 --- a/src/mainboard/roda/rk886ex/mainboard.c +++ b/src/mainboard/roda/rk886ex/mainboard.c @@ -24,7 +24,7 @@ #include <arch/io.h> #include <arch/interrupt.h> #include <delay.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif @@ -60,7 +60,7 @@ static void backlight_enable(void) #define BOOT_DISPLAY_EFP2 (1 << 6) #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) { /* 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 */ 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/samsung/lumpy/mainboard.c b/src/mainboard/samsung/lumpy/mainboard.c index c1749f7026..c5fe45c3eb 100644 --- a/src/mainboard/samsung/lumpy/mainboard.c +++ b/src/mainboard/samsung/lumpy/mainboard.c @@ -24,7 +24,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -49,7 +49,7 @@ void mainboard_suspend_resume(void) 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) { int res=0; @@ -206,7 +206,7 @@ static void mainboard_enable(device_t dev) { dev->ops->init = mainboard_init; 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/samsung/stumpy/mainboard.c b/src/mainboard/samsung/stumpy/mainboard.c index 30612db271..d6a7b552ce 100644 --- a/src/mainboard/samsung/stumpy/mainboard.c +++ b/src/mainboard/samsung/stumpy/mainboard.c @@ -25,7 +25,7 @@ #include <device/pci_def.h> #include <device/pci_ops.h> #include <console/console.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #include <pc80/mc146818rtc.h> @@ -42,7 +42,7 @@ void mainboard_suspend_resume(void) outb(0xcb, 0xb2); } -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN static int int15_handler(void) { int res=0; @@ -147,7 +147,7 @@ static void verb_setup(void) 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif diff --git a/src/mainboard/thomson/ip1000/mainboard.c b/src/mainboard/thomson/ip1000/mainboard.c index 90ba7065ee..705c427a86 100644 --- a/src/mainboard/thomson/ip1000/mainboard.c +++ b/src/mainboard/thomson/ip1000/mainboard.c @@ -21,7 +21,7 @@ #include <console/console.h> #include <device/device.h> #include <delay.h> -#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN +#if CONFIG_VGA_ROM_RUN #include <x86emu/x86emu.h> #endif #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) { #define BOOT_DISPLAY_DEFAULT 0 @@ -142,7 +142,7 @@ static void mainboard_init(device_t dev) static void mainboard_enable(device_t dev) { 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 */ mainboard_interrupt_handlers(0x15, &int15_handler); #endif |