summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coreboot.org>2010-12-17 00:08:21 +0000
committerStefan Reinauer <stepan@openbios.org>2010-12-17 00:08:21 +0000
commit85b0fa1ace685bfdb1f1febbbf5127710a314888 (patch)
tree11fac9795931c6cdca6a785301d9294e4ba9dcae /src/mainboard
parentefbfd501fee8decd0942808a47a3f9e93d30ae38 (diff)
downloadcoreboot-85b0fa1ace685bfdb1f1febbbf5127710a314888.tar.xz
drop one more version of doing serial uart output differently.
coreboot made it kind of complicated to print a character on serial. Not quite as complicated as UEFI, but too much for a good design. Fix it. Signed-off-by: Stefan Reinauer <stepan@coreboot.org> Acked-by: Stefan Reinauer <stepan@coreboot.org> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@6191 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/amd/serengeti_cheetah/ap_romstage.c3
-rw-r--r--src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c1
-rw-r--r--src/mainboard/gigabyte/m57sli/ap_romstage.c1
-rw-r--r--src/mainboard/msi/ms7260/ap_romstage.c2
-rw-r--r--src/mainboard/nvidia/l1_2pvv/ap_romstage.c13
-rw-r--r--src/mainboard/supermicro/h8dme/ap_romstage.c9
-rw-r--r--src/mainboard/supermicro/h8dmr/ap_romstage.c1
-rw-r--r--src/mainboard/tyan/s2912/ap_romstage.c6
8 files changed, 6 insertions, 30 deletions
diff --git a/src/mainboard/amd/serengeti_cheetah/ap_romstage.c b/src/mainboard/amd/serengeti_cheetah/ap_romstage.c
index b3d375edd4..ca59458ce8 100644
--- a/src/mainboard/amd/serengeti_cheetah/ap_romstage.c
+++ b/src/mainboard/amd/serengeti_cheetah/ap_romstage.c
@@ -11,9 +11,6 @@
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
#include <pc80/mc146818rtc.h>
-#include "pc80/serial.c"
-#include "./arch/x86/lib/printk_init.c"
-
#include "console/console.c"
#include "lib/uart8250.c"
#include "console/vtxprintf.c"
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c b/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c
index 88b7ca1608..51902b4bbb 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/ap_romstage.c
@@ -34,7 +34,6 @@
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
#include <pc80/mc146818rtc.h>
-#include "pc80/serial.c"
#include "lib/uart8250.c"
#include "arch/x86/lib/printk_init.c"
diff --git a/src/mainboard/gigabyte/m57sli/ap_romstage.c b/src/mainboard/gigabyte/m57sli/ap_romstage.c
index ff3ac11a86..c9c0de1c66 100644
--- a/src/mainboard/gigabyte/m57sli/ap_romstage.c
+++ b/src/mainboard/gigabyte/m57sli/ap_romstage.c
@@ -32,7 +32,6 @@
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
#include <pc80/mc146818rtc.h>
-#include "pc80/serial.c"
#include "lib/uart8250.c"
#include "arch/x86/lib/printk_init.c"
diff --git a/src/mainboard/msi/ms7260/ap_romstage.c b/src/mainboard/msi/ms7260/ap_romstage.c
index 3a10971186..418bb09084 100644
--- a/src/mainboard/msi/ms7260/ap_romstage.c
+++ b/src/mainboard/msi/ms7260/ap_romstage.c
@@ -33,7 +33,7 @@
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
#include <pc80/mc146818rtc.h>
-#include "pc80/serial.c"
+#include "lib/uart8259.c"
#include "console/console.c"
#include <cpu/amd/model_fxx_rev.h>
diff --git a/src/mainboard/nvidia/l1_2pvv/ap_romstage.c b/src/mainboard/nvidia/l1_2pvv/ap_romstage.c
index 6efcb980a3..438ed58cf5 100644
--- a/src/mainboard/nvidia/l1_2pvv/ap_romstage.c
+++ b/src/mainboard/nvidia/l1_2pvv/ap_romstage.c
@@ -32,8 +32,6 @@
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
#include <pc80/mc146818rtc.h>
-#include "pc80/serial.c"
-
#include "lib/uart8250.c"
#include "arch/x86/lib/printk_init.c"
#include "console/vtxprintf.c"
@@ -45,7 +43,6 @@
#include "lib/delay.c"
-//#include "cpu/x86/lapic/boot_cpu.c"
#include "northbridge/amd/amdk8/reset_test.c"
#include "northbridge/amd/amdk8/debug.c"
@@ -78,17 +75,15 @@ void hardwaremain(int ret_addr)
train_ram(id.nodeid, sysinfo, sysinfox);
/*
- go back, but can not use stack any more, because we only keep ret_addr and can not restore esp, and ebp
- */
+ * go back, but can not use stack any more, because we only keep
+ * ret_addr and can not restore esp, and ebp
+ */
__asm__ volatile (
"movl %0, %%edi\n\t"
"jmp *%%edi\n\t"
:: "a"(ret_addr)
);
-
-
-
}
#include <arch/registers.h>
@@ -99,5 +94,3 @@ void x86_exception(struct eregs *info)
hlt();
} while(1);
}
-
-
diff --git a/src/mainboard/supermicro/h8dme/ap_romstage.c b/src/mainboard/supermicro/h8dme/ap_romstage.c
index 9b3f9c87fc..6904b6d51b 100644
--- a/src/mainboard/supermicro/h8dme/ap_romstage.c
+++ b/src/mainboard/supermicro/h8dme/ap_romstage.c
@@ -32,7 +32,6 @@
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
#include <pc80/mc146818rtc.h>
-#include "pc80/serial.c"
#include "console/console.c"
#include "lib/uart8250.c"
@@ -82,17 +81,14 @@ void hardwaremain(int ret_addr)
train_ram(id.nodeid, sysinfo, sysinfox);
/*
- go back, but can not use stack any more, because we only keep ret_addr and can not restore esp, and ebp
- */
+ * go back, but can not use stack any more, because we only keep ret_addr and can not restore esp, and ebp
+ */
__asm__ volatile (
"movl %0, %%edi\n\t"
"jmp *%%edi\n\t"
:: "a"(ret_addr)
);
-
-
-
}
#include <arch/registers.h>
@@ -104,4 +100,3 @@ void x86_exception(struct eregs *info)
} while(1);
}
-
diff --git a/src/mainboard/supermicro/h8dmr/ap_romstage.c b/src/mainboard/supermicro/h8dmr/ap_romstage.c
index 9b3f9c87fc..e56561e746 100644
--- a/src/mainboard/supermicro/h8dmr/ap_romstage.c
+++ b/src/mainboard/supermicro/h8dmr/ap_romstage.c
@@ -32,7 +32,6 @@
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
#include <pc80/mc146818rtc.h>
-#include "pc80/serial.c"
#include "console/console.c"
#include "lib/uart8250.c"
diff --git a/src/mainboard/tyan/s2912/ap_romstage.c b/src/mainboard/tyan/s2912/ap_romstage.c
index 6e0a9c88f5..8b7805b03a 100644
--- a/src/mainboard/tyan/s2912/ap_romstage.c
+++ b/src/mainboard/tyan/s2912/ap_romstage.c
@@ -32,8 +32,6 @@
#include <arch/romcc_io.h>
#include <cpu/x86/lapic.h>
#include <pc80/mc146818rtc.h>
-#include "pc80/serial.c"
-
#include "console/console.c"
#include <cpu/amd/model_fxx_rev.h>
@@ -83,9 +81,6 @@ void hardwaremain(int ret_addr)
"jmp *%%edi\n\t"
:: "a"(ret_addr)
);
-
-
-
}
#include <arch/registers.h>
@@ -97,4 +92,3 @@ void x86_exception(struct eregs *info)
} while(1);
}
-