From f94a97be7208781cd63f4aebfc48ee94a739eecc Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 21 Apr 2010 20:55:38 +0000 Subject: 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 Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5473 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/devices/oprom/x86.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/devices') 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 #include +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); -- cgit v1.2.3