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
This commit is contained in:
parent
efbfd501fe
commit
85b0fa1ace
17 changed files with 248 additions and 231 deletions
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue