summaryrefslogtreecommitdiff
path: root/src/mainboard/thomson
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2013-04-23 15:23:15 -0700
committerStefan Reinauer <stefan.reinauer@coreboot.org>2013-11-25 23:03:58 +0100
commit454744fd8665eba8721adcd6d84e74c17f8b2b42 (patch)
treee17e880282cde68ead36cb8a4e0c44d50fb1fcf3 /src/mainboard/thomson
parent98e4d8aabb7c42115682b18ef5740e944e9a03a1 (diff)
downloadcoreboot-454744fd8665eba8721adcd6d84e74c17f8b2b42.tar.xz
Unify and clean up remaining INT15 handlers
Some handlers still had 2 variants, others were incorrectly guarded by CONFIG_ variables. This patch straightens them out. This does not touch the siemens/sitemp_g1p1 which provides an interestingly complex solution for the int15 handler. Signed-off-by: Stefan Reinauer <reinauer@google.com> Change-Id: I5d74fdf7c2ab1faa96ebc2b5ca5c69398449b069 Reviewed-on: https://gerrit.chromium.org/gerrit/48979 Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Patrick Georgi <patrick@georgi-clan.de> Commit-Queue: Stefan Reinauer <reinauer@google.com> Tested-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/4140 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/mainboard/thomson')
-rw-r--r--src/mainboard/thomson/ip1000/mainboard.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mainboard/thomson/ip1000/mainboard.c b/src/mainboard/thomson/ip1000/mainboard.c
index 909c9f61f8..90ba7065ee 100644
--- a/src/mainboard/thomson/ip1000/mainboard.c
+++ b/src/mainboard/thomson/ip1000/mainboard.c
@@ -21,10 +21,11 @@
#include <console/console.h>
#include <device/device.h>
#include <delay.h>
-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
#include <x86emu/x86emu.h>
#endif
#include <arch/io.h>
+#include <arch/interrupt.h>
// setting the bit disables the led.
#define PARPORT_GPIO_LED_GREEN (1 << 0)
@@ -86,7 +87,7 @@ static void flash_gpios(void)
}
-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
static int int15_handler(void)
{
#define BOOT_DISPLAY_DEFAULT 0
@@ -141,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_OPTION_ROM_RUN_YABEL
+#if CONFIG_PCI_ROM_RUN || CONFIG_VGA_ROM_RUN
/* Install custom int15 handler for VGA OPROM */
mainboard_interrupt_handlers(0x15, &int15_handler);
#endif