summaryrefslogtreecommitdiff
path: root/src/devices
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-04-21 20:55:38 +0000
committerStefan Reinauer <stepan@openbios.org>2010-04-21 20:55:38 +0000
commitf94a97be7208781cd63f4aebfc48ee94a739eecc (patch)
tree368ef3d8494e0df7d3045ee4d223ac38f8e4ffcb /src/devices
parent6c705110f65e3de4df11e0a433005876925f539f (diff)
downloadcoreboot-f94a97be7208781cd63f4aebfc48ee94a739eecc.tar.xz
oops, sorry for the last commit. This commit changes the code to distinguish
between having VSA functionality in the code, and adding a VSA image to the ROM. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5473 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/oprom/x86.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/oprom/x86.c b/src/devices/oprom/x86.c
index ca08b0657d..4ed0ff8709 100644
--- a/src/devices/oprom/x86.c
+++ b/src/devices/oprom/x86.c
@@ -37,7 +37,6 @@ void x86_exception(struct eregs *info);
extern unsigned char __idt_handler, __idt_handler_size;
extern unsigned char __realmode_code, __realmode_code_size;
extern unsigned char __run_optionrom, __run_interrupt;
-extern unsigned char __run_vsa;
void (*run_optionrom)(u32 devfn) __attribute__((regparm(0))) = (void *)&__run_optionrom;
void (*vga_enable_console)(void) __attribute__((regparm(0))) = (void *)&__run_interrupt;
@@ -167,11 +166,12 @@ void run_bios(struct device *dev, unsigned long addr)
#include <cpu/amd/vr.h>
#include <cbfs.h>
+extern unsigned char __run_vsa;
+void (*run_vsa)(u32 smm, u32 sysmem) __attribute__((regparm(0))) = (void *)&__run_vsa;
+
#define VSA2_BUFFER 0x60000
#define VSA2_ENTRY_POINT 0x60020
-void (*run_vsa)(u32 smm, u32 sysmem) __attribute__((regparm(0))) = (void *)&__run_vsa;
-
// TODO move to a header file.
void do_vsmbios(void);