aboutsummaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/x86/lib/printk_init.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/src/arch/x86/lib/printk_init.c b/src/arch/x86/lib/printk_init.c
index 2f7f751832..e8a926356e 100644
--- a/src/arch/x86/lib/printk_init.c
+++ b/src/arch/x86/lib/printk_init.c
@@ -19,23 +19,30 @@
#include <console/console.h>
#include <console/vtxprintf.h>
+#if CONFIG_CONSOLE_SERIAL8250
#include <uart8250.h>
-
+#endif
+#if CONFIG_USBDEBUG
+#include <usbdebug.h>
+#endif
#if CONFIG_CONSOLE_NE2K
#include <console/ne2k.h>
#endif
static void console_tx_byte(unsigned char byte)
{
-#if CONFIG_CONSOLE_NE2K
-#ifdef __PRE_RAM__
- ne2k_append_data(&byte, 1, CONFIG_CONSOLE_NE2K_IO_PORT);
-#endif
-#endif
if (byte == '\n')
- uart8250_tx_byte(CONFIG_TTYS0_BASE, '\r');
+ console_tx_byte('\r');
+#if CONFIG_CONSOLE_SERIAL8250
uart8250_tx_byte(CONFIG_TTYS0_BASE, byte);
+#endif
+#if CONFIG_USBDEBUG
+ usbdebug_tx_byte(byte);
+#endif
+#if CONFIG_CONSOLE_NE2K
+ ne2k_append_data(&byte, 1, CONFIG_CONSOLE_NE2K_IO_PORT);
+#endif
}
int do_printk(int msg_level, const char *fmt, ...)