diff options
Diffstat (limited to 'src/mainboard/google')
-rw-r--r-- | src/mainboard/google/bolt/mainboard.c | 6 | ||||
-rw-r--r-- | src/mainboard/google/butterfly/mainboard.c | 6 | ||||
-rw-r--r-- | src/mainboard/google/falco/mainboard.c | 6 | ||||
-rw-r--r-- | src/mainboard/google/link/mainboard.c | 6 | ||||
-rw-r--r-- | src/mainboard/google/parrot/mainboard.c | 6 | ||||
-rw-r--r-- | src/mainboard/google/peppy/mainboard.c | 6 | ||||
-rw-r--r-- | src/mainboard/google/slippy/mainboard.c | 6 | ||||
-rw-r--r-- | src/mainboard/google/stout/mainboard.c | 6 |
8 files changed, 24 insertions, 24 deletions
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 |