From b643e782d0cbb6992bc2061a0ee5f65b6455725e Mon Sep 17 00:00:00 2001
From: "Ronald G. Minnich" <rminnich@gmail.com>
Date: Tue, 9 Mar 2004 00:07:12 +0000
Subject: [PATCH] more fixes for dave ashley

---
 src/arch/i386/lib/vgabios.c             |  4 ++--
 src/mainboard/via/epia-m/example.config | 15 +++++++++++++--
 src/mainboard/via/epia-m/mainboard.c    |  5 +++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/arch/i386/lib/vgabios.c b/src/arch/i386/lib/vgabios.c
index 6b8943778b..e46661a998 100644
--- a/src/arch/i386/lib/vgabios.c
+++ b/src/arch/i386/lib/vgabios.c
@@ -139,8 +139,8 @@ __asm__ (
 "	orl	$0x0000001, %eax\n" /* PE = 1 */
 "	movl	%eax, %cr0\n"
 /* Now that we are in protected mode jump to a 32 bit code segment. */
-"	ljmpl	$0x10, $1f\n"
-"1:\n"
+"	ljmpl	$0x10, $vgarestart\n"
+"vgarestart:\n"
 ".code32\n"
 "	movw	$0x18, %ax\n"
 "	movw	%ax, %ds\n"
diff --git a/src/mainboard/via/epia-m/example.config b/src/mainboard/via/epia-m/example.config
index dc4a5feb16..0fa8394a81 100644
--- a/src/mainboard/via/epia-m/example.config
+++ b/src/mainboard/via/epia-m/example.config
@@ -9,9 +9,20 @@ mainboard via/epia-m
 
 # Enable Serial Console for debugging
 option SERIAL_CONSOLE=1
-# option SERIAL_POST=1
-option TTYS0_BAUD=115200
+#option SERIAL_POST=1
+#option TTYS0_BAUD=115200
 # option TTYS0_BAUD=57600
+option HAVE_FRAMEBUFFER=1
+option CONFIG_VGABIOS=1
+option CONFIG_REALMODE_IDT=1
+dir src/bioscall
+option CONFIG_PCIBIOS=1
+option VGABIOS_START=0xfffe0000
+addaction romimage dd if=../vgabios.bin of=romimage bs=65536 seek=2 conv=sync conv=notrunc
+option CONFIG_EPIAMVERSIONSTRING="5.0.0E-" __DATE__ " " __TIME__
+target /ram/freebios/obj
+payload /code/bootfiles/etherboot/via6105m.ebi
+
 option DEFAULT_CONSOLE_LOGLEVEL=9
 option DEBUG=1
 
diff --git a/src/mainboard/via/epia-m/mainboard.c b/src/mainboard/via/epia-m/mainboard.c
index 8a4b6e0392..8920dd49ee 100644
--- a/src/mainboard/via/epia-m/mainboard.c
+++ b/src/mainboard/via/epia-m/mainboard.c
@@ -86,8 +86,6 @@ static unsigned char vt1211hwmonitorinits[]={
 void
 mainboard_fixup()
 {
- 	struct pci_dev *dev;
- 	int i;
 	printk_info("Mainboard fixup\n");
 
 	northbridge_fixup();
@@ -97,6 +95,9 @@ mainboard_fixup()
 void
 final_southbridge_fixup()
 {
+ 	struct pci_dev *dev;
+ 	int i;
+
 	printk_info("Southbridge fixup\n");
 
 	//	nvram_on();