summaryrefslogtreecommitdiff
path: root/src/mainboard/thomson
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-09-01 01:41:37 +0200
committerVladimir Serbinenko <phcoder@gmail.com>2014-09-05 22:48:49 +0200
commita2a906e47a87acc3acdca0ee2790ff96409b9b46 (patch)
tree32bd54895f2c1f199d649ed96a2dd7f2e9a4e722 /src/mainboard/thomson
parenta4857052f756507e18a54beba704f183f128a057 (diff)
downloadcoreboot-a2a906e47a87acc3acdca0ee2790ff96409b9b46.tar.xz
Consolidate intel vga int15 hooks
Change-Id: I9366dded98bf15f6da44ce893dd10698ba09fd55 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/6820 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'src/mainboard/thomson')
-rw-r--r--src/mainboard/thomson/ip1000/Kconfig1
-rw-r--r--src/mainboard/thomson/ip1000/mainboard.c56
2 files changed, 3 insertions, 54 deletions
diff --git a/src/mainboard/thomson/ip1000/Kconfig b/src/mainboard/thomson/ip1000/Kconfig
index a68c72af38..80d365c533 100644
--- a/src/mainboard/thomson/ip1000/Kconfig
+++ b/src/mainboard/thomson/ip1000/Kconfig
@@ -9,6 +9,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select HAVE_PIRQ_TABLE
select UDELAY_TSC
select BOARD_ROMSIZE_KB_512
+ select INTEL_INT15
config MAINBOARD_DIR
string
diff --git a/src/mainboard/thomson/ip1000/mainboard.c b/src/mainboard/thomson/ip1000/mainboard.c
index 705c427a86..726769607a 100644
--- a/src/mainboard/thomson/ip1000/mainboard.c
+++ b/src/mainboard/thomson/ip1000/mainboard.c
@@ -21,9 +21,7 @@
#include <console/console.h>
#include <device/device.h>
#include <delay.h>
-#if CONFIG_VGA_ROM_RUN
-#include <x86emu/x86emu.h>
-#endif
+#include <drivers/intel/gma/int15.h>
#include <arch/io.h>
#include <arch/interrupt.h>
@@ -86,53 +84,6 @@ static void flash_gpios(void)
}
}
-
-#if CONFIG_VGA_ROM_RUN
-static int int15_handler(void)
-{
-#define BOOT_DISPLAY_DEFAULT 0
-#define BOOT_DISPLAY_CRT (1 << 0)
-#define BOOT_DISPLAY_TV (1 << 1)
-#define BOOT_DISPLAY_EFP (1 << 2)
-#define BOOT_DISPLAY_LCD (1 << 3)
-#define BOOT_DISPLAY_CRT2 (1 << 4)
-#define BOOT_DISPLAY_TV2 (1 << 5)
-#define BOOT_DISPLAY_EFP2 (1 << 6)
-#define BOOT_DISPLAY_LCD2 (1 << 7)
-
- printk(BIOS_DEBUG, "%s: AX=%04x BX=%04x CX=%04x DX=%04x\n",
- __func__, X86_AX, X86_BX, X86_CX, X86_DX);
-
- switch (X86_AX) {
- case 0x5f35: /* Boot Display */
- X86_AX = 0x005f; // Success
- //M.x86.R_CL = BOOT_DISPLAY_TV2;
- X86_CL = BOOT_DISPLAY_DEFAULT;
- break;
- case 0x5f36: /* Boot TV Format Hook */
- printk(BIOS_DEBUG, "Boot TV Format Hook. TODO\n");
- /* Interrupt was not handled */
- return 0;
- case 0x5f31: /* Post Completion Hook */
- case 0x5f33: /* Hook After Mode Set */
- case 0x5f34: /* Set Panel Fitting Hook */
- case 0x5f38: /* Hook Before Mode Set */
- case 0x5f45: /* Hook Before VESA VBE/DDC */
- case 0x5f46: /* Hook Before VESA VBE/PM */
- case 0x5f47: /* Notif Display Switch Hook */
- case 0x5f65: /* Local Memory Initialization Hook */
- /* Interrupt was not handled */
- return 0;
- default:
- /* Interrupt was not handled */
- return 0;
- }
-
- /* Interrupt handled */
- return 1;
-}
-#endif
-
static void mainboard_init(device_t dev)
{
parport_gpios();
@@ -142,10 +93,7 @@ static void mainboard_init(device_t dev)
static void mainboard_enable(device_t dev)
{
dev->ops->init = mainboard_init;
-#if CONFIG_VGA_ROM_RUN
- /* Install custom int15 handler for VGA OPROM */
- mainboard_interrupt_handlers(0x15, &int15_handler);
-#endif
+ install_intel_vga_int15_handler(GMA_INT15_ACTIVE_LFP_INT_LVDS, GMA_INT15_PANEL_FIT_DEFAULT, GMA_INT15_BOOT_DISPLAY_DEFAULT, 0);
}
struct chip_operations mainboard_ops = {