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/cx700 | |
| 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/cx700')
| -rw-r--r-- | src/northbridge/via/cx700/northbridge.c | 1 | ||||
| -rw-r--r-- | src/northbridge/via/cx700/northbridge.h | 26 | ||||
| -rw-r--r-- | src/northbridge/via/cx700/vga.c | 6 |
3 files changed, 5 insertions, 28 deletions
diff --git a/src/northbridge/via/cx700/northbridge.c b/src/northbridge/via/cx700/northbridge.c index 1df9ce0814..3d7137e5de 100644 --- a/src/northbridge/via/cx700/northbridge.c +++ b/src/northbridge/via/cx700/northbridge.c @@ -29,7 +29,6 @@ #include <bitops.h> #include <cpu/cpu.h> #include <cpu/x86/mtrr.h> -#include "northbridge.h" #if CONFIG_WRITE_HIGH_TABLES #include <cbmem.h> diff --git a/src/northbridge/via/cx700/northbridge.h b/src/northbridge/via/cx700/northbridge.h deleted file mode 100644 index c651bfe5f2..0000000000 --- a/src/northbridge/via/cx700/northbridge.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007-2009 coresystems GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef NORTHBRIDGE_VIA_CX700_H -#define NORTHBRIDGE_VIA_CX700_H - -extern unsigned int cx700_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_CX700_H */ diff --git a/src/northbridge/via/cx700/vga.c b/src/northbridge/via/cx700/vga.c index 821edc4992..c6bf72ea8f 100644 --- a/src/northbridge/via/cx700/vga.c +++ b/src/northbridge/via/cx700/vga.c @@ -31,7 +31,9 @@ #include <cpu/x86/msr.h> #include <arch/interrupt.h> #include "registers.h" -#include "northbridge.h" +#if CONFIG_PCI_OPTION_ROM_RUN_REALMODE +#include <devices/oprom/x86.h> +#endif /* PCI Domain 1 Device 0 Function 0 */ @@ -145,6 +147,7 @@ static void write_protect_vgabios(void) 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. @@ -152,6 +155,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) |