summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/armv7/early_console.c4
-rw-r--r--src/arch/x86/lib/romcc_console.c6
-rw-r--r--src/arch/x86/lib/romstage_console.c10
3 files changed, 7 insertions, 13 deletions
diff --git a/src/arch/armv7/early_console.c b/src/arch/armv7/early_console.c
index 93ea38d43a..7614531c71 100644
--- a/src/arch/armv7/early_console.c
+++ b/src/arch/armv7/early_console.c
@@ -28,7 +28,7 @@ void console_tx_byte(unsigned char byte)
if (byte == '\n')
console_tx_byte('\r');
-#if CONFIG_CONSOLE_SERIAL_UART
+#if CONFIG_CONSOLE_SERIAL
uart_tx_byte(byte);
#endif
#if CONFIG_CONSOLE_CBMEM && !defined(__BOOT_BLOCK__)
@@ -38,7 +38,7 @@ void console_tx_byte(unsigned char byte)
static void _console_tx_flush(void)
{
-#if CONFIG_CONSOLE_SERIAL_UART
+#if CONFIG_CONSOLE_SERIAL
uart_tx_flush();
#endif
}
diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/lib/romcc_console.c
index 66c81db36f..4bd3ad474f 100644
--- a/src/arch/x86/lib/romcc_console.c
+++ b/src/arch/x86/lib/romcc_console.c
@@ -30,7 +30,7 @@
*/
#define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL
-#if CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_CONSOLE_SERIAL && CONFIG_DRIVERS_UART_8250IO
#include "drivers/uart/util.c"
#include "drivers/uart/uart8250io.c"
#endif
@@ -40,7 +40,7 @@
static void __console_tx_byte(unsigned char byte)
{
-#if CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_CONSOLE_SERIAL
uart_tx_byte(byte);
#endif
#if CONFIG_CONSOLE_NE2K
@@ -61,7 +61,7 @@ static void __console_tx_nibble(unsigned nibble)
static void __console_tx_char(int loglevel, unsigned char byte)
{
if (console_loglevel >= loglevel) {
-#if CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_CONSOLE_SERIAL
uart_tx_byte(byte);
#endif
#if CONFIG_CONSOLE_NE2K
diff --git a/src/arch/x86/lib/romstage_console.c b/src/arch/x86/lib/romstage_console.c
index 5e7923e64f..0337245ee7 100644
--- a/src/arch/x86/lib/romstage_console.c
+++ b/src/arch/x86/lib/romstage_console.c
@@ -31,10 +31,7 @@ void console_tx_byte(unsigned char byte)
if (byte == '\n')
console_tx_byte('\r');
-#if CONFIG_CONSOLE_SERIAL8250MEM
- uart_tx_byte(byte);
-#endif
-#if CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_CONSOLE_SERIAL
uart_tx_byte(byte);
#endif
#if CONFIG_CONSOLE_USB && (CONFIG_USBDEBUG_IN_ROMSTAGE || !defined(__PRE_RAM__))
@@ -53,10 +50,7 @@ void console_tx_byte(unsigned char byte)
void console_tx_flush(void)
{
-#if CONFIG_CONSOLE_SERIAL8250MEM
- uart_tx_flush();
-#endif
-#if CONFIG_CONSOLE_SERIAL8250
+#if CONFIG_CONSOLE_SERIAL
uart_tx_flush();
#endif
#if CONFIG_CONSOLE_NE2K