Author: stepan Date: 2007-04-06 21:51:02 +0200 (Fri, 06 Apr 2007) New Revision: 2589
Modified: trunk/LinuxBIOSv2/src/include/cpu/x86/bist.h trunk/LinuxBIOSv2/src/pc80/serial.c Log: 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
Modified: trunk/LinuxBIOSv2/src/include/cpu/x86/bist.h =================================================================== --- trunk/LinuxBIOSv2/src/include/cpu/x86/bist.h 2007-04-06 19:49:05 UTC (rev 2588) +++ trunk/LinuxBIOSv2/src/include/cpu/x86/bist.h 2007-04-06 19:51:02 UTC (rev 2589) @@ -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: ");
Modified: trunk/LinuxBIOSv2/src/pc80/serial.c =================================================================== --- trunk/LinuxBIOSv2/src/pc80/serial.c 2007-04-06 19:49:05 UTC (rev 2588) +++ trunk/LinuxBIOSv2/src/pc80/serial.c 2007-04-06 19:51:02 UTC (rev 2589) @@ -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) {