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

diff --git a/src/include/cpu/x86/bist.h b/src/include/cpu/x86/bist.h
index ff66eabe9b057c74a987a63128a82e704c6e6364..21ea69e67b4bb225f0e9ed6d4f79d8565f16ed7c 100644 (file)
--- 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: ");

diff --git a/src/pc80/serial.c b/src/pc80/serial.c
index 475c9bccf5c5b6fb42f52c32fea0db825a6bd3c0..f8005da277113b4427f8ace0957c2c378b8e4937 100644 (file)
--- 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 @@ static void uart_init(void)
        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)
 {