Stefan Reinauer (stefan.reinauer@coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/691
-gerrit
commit fa84bc28c757a27cf768989db805e5636219366c Author: Stefan Reinauer reinauer@chromium.org Date: Tue May 10 10:46:41 2011 -0700
move console includes to central console/console.h
Because it's included everywhere anyways.
Change-Id: I99a9e6edac08df57c50ef3a706fdbd395cad0abc Signed-off-by: Stefan Reinauer reinauer@google.com --- src/console/console.c | 24 ++++++------------------ src/cpu/x86/smm/smiutil.c | 10 ---------- src/include/console/console.h | 17 ++++++++++------- src/include/uart8250.h | 31 ++++++++++--------------------- 4 files changed, 26 insertions(+), 56 deletions(-)
diff --git a/src/console/console.c b/src/console/console.c index 325170d..d933668 100644 --- a/src/console/console.c +++ b/src/console/console.c @@ -22,18 +22,6 @@ #include <arch/hlt.h> #include <arch/io.h>
-#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM -#include <uart8250.h> -#endif - -#if CONFIG_CONSOLE_NE2K -#include <console/ne2k.h> -#endif - -#if CONFIG_USBDEBUG -#include <usbdebug.h> -#endif - #ifndef __PRE_RAM__ #include <string.h> #include <pc80/mc146818rtc.h> @@ -52,21 +40,21 @@ void console_init(void) } }
-static void __console_tx_byte(unsigned char byte) +void console_tx_flush(void) { struct console_driver *driver; for(driver = console_drivers; driver < econsole_drivers; driver++) { - driver->tx_byte(byte); + if (!driver->tx_flush) + continue; + driver->tx_flush(); } }
-void console_tx_flush(void) +static void __console_tx_byte(unsigned char byte) { struct console_driver *driver; for(driver = console_drivers; driver < econsole_drivers; driver++) { - if (!driver->tx_flush) - continue; - driver->tx_flush(); + driver->tx_byte(byte); } }
diff --git a/src/cpu/x86/smm/smiutil.c b/src/cpu/x86/smm/smiutil.c index d9057d8..9cd63ed 100644 --- a/src/cpu/x86/smm/smiutil.c +++ b/src/cpu/x86/smm/smiutil.c @@ -23,18 +23,8 @@ #include <arch/romcc_io.h> #include <cpu/x86/cache.h> #include <cpu/x86/smm.h> - #include <console/console.h> #include <console/vtxprintf.h> -#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM -#include <uart8250.h> -#endif -#if CONFIG_USBDEBUG -#include <usbdebug.h> -#endif -#if CONFIG_CONSOLE_NE2K -#include <console/ne2k.h> -#endif
#if CONFIG_CONSOLE_SERIAL8250MEM static u32 serial8250mem_base_address = 0; diff --git a/src/include/console/console.h b/src/include/console/console.h index 8283f66..54c825c 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -24,15 +24,21 @@ #include <console/loglevel.h> #include <console/post_codes.h>
+#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM +#include <uart8250.h> +#endif +#if CONFIG_USBDEBUG +#include <usbdebug.h> +#endif +#if CONFIG_CONSOLE_NE2K +#include <console/ne2k.h> +#endif + #ifndef __PRE_RAM__ void console_tx_byte(unsigned char byte); void console_tx_flush(void); unsigned char console_rx_byte(void); int console_tst_byte(void); -#if CONFIG_USBDEBUG -#include <usbdebug.h> -#endif - struct console_driver { void (*init)(void); void (*tx_byte)(unsigned char byte); @@ -55,9 +61,6 @@ extern int console_loglevel; * we could use the same code on all architectures. */ #define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL -#if CONFIG_CONSOLE_SERIAL8250 -#include <uart8250.h> -#endif #endif
#ifndef __ROMCC__ diff --git a/src/include/uart8250.h b/src/include/uart8250.h index 3c8ea09..aa510e5 100644 --- a/src/include/uart8250.h +++ b/src/include/uart8250.h @@ -20,26 +20,7 @@ #ifndef UART8250_H #define UART8250_H
-/* Base Address */ -#ifndef CONFIG_TTYS0_BASE -#define CONFIG_TTYS0_BASE 0x3f8 -#endif - -#ifndef CONFIG_TTYS0_BAUD -#define CONFIG_TTYS0_BAUD 115200 -#endif -#if ((115200%CONFIG_TTYS0_BAUD) != 0) -#error Bad ttys0 baud rate -#endif - -/* Line Control Settings */ -#ifndef CONFIG_TTYS0_LCS -/* Set 8bit, 1 stop bit, no parity */ -#define CONFIG_TTYS0_LCS 0x3 -#endif - -#define UART_LCS CONFIG_TTYS0_LCS - +#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM
/* Data */ #define UART_RBR 0x00 @@ -126,6 +107,12 @@ #define UART_SCR 0x07 #define UART_SPR 0x07
+#if ((115200 % CONFIG_TTYS0_BAUD) != 0) +#error Bad ttyS0 baud rate +#endif + +/* Line Control Settings */ +#define UART_LCS CONFIG_TTYS0_LCS
#ifndef __ROMCC__ unsigned char uart8250_rx_byte(unsigned base_port); @@ -151,6 +138,8 @@ u32 uartmem_getbaseaddr(void); /* and special init for OXPCIe based cards */ void oxford_init(void);
-#endif +#endif /* __ROMCC__ */ + +#endif /* CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM */
#endif /* UART8250_H */