commit a3cf00e4bab084a231cbd7cafab3c02342c400e0
author Yinghai Lu <yinghai.lu at amd.com> Fri Apr 06 19:51:02 2007 +0000
committer Stefan Reinauer <stepan@openbios.org> Fri Apr 06 19:51:02 2007 +0000
tree 5bcd5dcf2d1c6640077279e55cf64818e7a30f47
parent 21332b80d09adac3e6bb54c92e2a5e19db86a784

two more directories from YhLu's mcp55 megapatch.

Signed-off-by: Yinghai Lu <yinghai.lu at amd.com>
Signed-off-by: Ed Swierk <eswierk at arastra.com>
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ward Vandewege <ward at gnu.org>
Acked-by: Stefan Reinauer <stepan@coresystems.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2589 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

src/include/cpu/x86/bist.h

diff --git a/src/include/cpu/x86/bist.h b/src/include/cpu/x86/bist.h
index ff66eab..21ea69e 100644
--- a/src/include/cpu/x86/bist.h
+++ b/src/include/cpu/x86/bist.h
@@ -4,7 +4,7 @@
 static void report_bist_failure(unsigned long bist)
 {
 	if (bist != 0) {
-#if CONFIG_USE_INIT
+#if CONFIG_USE_PRINTK_IN_CAR
                 printk_emerg("BIST failed: %08x", bist);
 #else
 		print_emerg("BIST failed: ");

src/pc80/serial.c

diff --git a/src/pc80/serial.c b/src/pc80/serial.c
index 475c9bc..f8005da 100644
--- a/src/pc80/serial.c
+++ b/src/pc80/serial.c
@@ -24,7 +24,7 @@
 #define UART_LCS	TTYS0_LCS
 
 
-#if CONFIG_USE_INIT == 0
+#if CONFIG_USE_PRINTK_IN_CAR == 0
 
 /* Data */
 #define UART_RBR 0x00
@@ -92,6 +92,7 @@
 	outb(UART_LCS, TTYS0_BASE + UART_LCR);
 }
 #else
+#include "../lib/uart8250.c"
 extern void uart8250_init(unsigned base_port, unsigned divisor, unsigned lcs);
 static void uart_init(void)
 {