diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2012-11-13 12:49:59 -0800 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2012-11-14 05:56:05 +0100 |
| commit | c5334635caca830600525f9c914465c0c17ec4fc (patch) | |
| tree | 46252b3f14e93382938287d71caa1c81b9c396bc /src/northbridge/via/vt8623 | |
| parent | 13c2c025a46291cc6f06cb55dde9a4d54a4b37fe (diff) | |
VIA chipsets: fix compilation without real mode code
The VIA chipsets CX700, VT8623 and VX800 required to be
configured with real mode option rom code enabled. This
patch fixes the issue and drops some unneeded header files.
Change-Id: I0d8a3f8f99c2eacec7666f08f85b99f09c06af84
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/1833
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/northbridge/via/vt8623')
| -rw-r--r-- | src/northbridge/via/vt8623/northbridge.c | 1 | ||||
| -rw-r--r-- | src/northbridge/via/vt8623/northbridge.h | 8 | ||||
| -rw-r--r-- | src/northbridge/via/vt8623/vga.c | 6 |
3 files changed, 5 insertions, 10 deletions
diff --git a/src/northbridge/via/vt8623/northbridge.c b/src/northbridge/via/vt8623/northbridge.c index 76cd7a052c..42864e069f 100644 --- a/src/northbridge/via/vt8623/northbridge.c +++ b/src/northbridge/via/vt8623/northbridge.c @@ -11,7 +11,6 @@ #include <cpu/cpu.h> #include <cpu/x86/mtrr.h> #include <cpu/x86/msr.h> -#include "northbridge.h" /* * This fixup is based on capturing values from an Award BIOS. Without diff --git a/src/northbridge/via/vt8623/northbridge.h b/src/northbridge/via/vt8623/northbridge.h deleted file mode 100644 index 176a590490..0000000000 --- a/src/northbridge/via/vt8623/northbridge.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef NORTHBRIDGE_VIA_VT8623_H -#define NORTHBRIDGE_VIA_VT8623_H - -unsigned int vt8623_scan_root_bus(device_t root, unsigned int max); -extern void (*realmode_interrupt)(u32 intno, u32 eax, u32 ebx, u32 ecx, u32 edx, - u32 esi, u32 edi) __attribute__((regparm(0))); - -#endif /* NORTHBRIDGE_VIA_VT8623_H */ diff --git a/src/northbridge/via/vt8623/vga.c b/src/northbridge/via/vt8623/vga.c index 20857a69a8..dffe7cb1ff 100644 --- a/src/northbridge/via/vt8623/vga.c +++ b/src/northbridge/via/vt8623/vga.c @@ -30,7 +30,9 @@ #include <cpu/x86/mtrr.h> #include <cpu/x86/msr.h> #include <arch/interrupt.h> -#include "northbridge.h" +#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE +#include <devices/oprom/x86.h> +#endif static int via_vt8623_int15_handler(struct eregs *regs) { @@ -99,6 +101,7 @@ static void vga_random_fixup(device_t dev) static void vga_enable_console(void) { +#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE /* Call VGA BIOS int10 function 0x4f14 to enable main console * Epia-M does not always autosense the main console so forcing * it on is good. @@ -106,6 +109,7 @@ static void vga_enable_console(void) /* int#, EAX, EBX, ECX, EDX, ESI, EDI */ realmode_interrupt(0x10, 0x4f14, 0x8003, 0x0001, 0x0000, 0x0000, 0x0000); +#endif } static void vga_init(device_t dev) |