Default to CRT on Kontron/986lcd-m. "default display" doesn't always

[coreboot.git] / src / mainboard / kontron / 986lcd-m / mainboard.c

diff --git a/src/mainboard/kontron/986lcd-m/mainboard.c b/src/mainboard/kontron/986lcd-m/mainboard.c
index 28d6de18e166301bc44771d7e4bb3413149db20c..c7a50db9e4ea015b5edd8dd07e6f523a996b3edd 100644 (file)
--- a/src/mainboard/kontron/986lcd-m/mainboard.c
+++ b/src/mainboard/kontron/986lcd-m/mainboard.c
@@ -20,21 +20,14 @@
 #include <types.h>
 #include <device/device.h>
 #include <console/console.h>
-#include <boot/tables.h>
-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL
 #include <x86emu/x86emu.h>
 #endif
 #include <pc80/mc146818rtc.h>
 #include <arch/io.h>
-#include <arch/coreboot_tables.h>
 #include "chip.h"
 
-int add_mainboard_resources(struct lb_memory *mem)
-{
-       return add_northbridge_resources(mem);
-}
-
-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL
 static int int15_handler(void)
 {
 #define BOOT_DISPLAY_DEFAULT   0
@@ -53,7 +46,7 @@ static int int15_handler(void)
        switch (M.x86.R_AX) {
        case 0x5f35: /* Boot Display */
                M.x86.R_AX = 0x005f; // Success
-               M.x86.R_CL = BOOT_DISPLAY_DEFAULT;
+               M.x86.R_CL = BOOT_DISPLAY_CRT;
                break;
        case 0x5f40: /* Boot Panel Type */
                // M.x86.R_AX = 0x015f; // Supported but failed
@@ -228,7 +221,7 @@ static void verb_setup(void)
 
 static void mainboard_enable(device_t dev)
 {
-#if CONFIG_PCI_OPTION_ROM_RUN_YABEL
+#if defined(CONFIG_PCI_OPTION_ROM_RUN_YABEL) && CONFIG_PCI_OPTION_ROM_RUN_YABEL
        /* Install custom int15 handler for VGA OPROM */
        int15_install();
 #endif