summaryrefslogtreecommitdiff
path: root/src/console/console.c
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-02-15 10:19:23 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-03-04 15:28:41 +0100
commit2b95da01e6bbdd8b001fa1ff2830dbaa70f14c3e (patch)
treed4dabf55577b4f01c133a94f506360e79286a777 /src/console/console.c
parent4770749edca1e54c9a04b48ca6909d786139fa1b (diff)
uart8250mem: Unify calls with generic UART
NOTE: UART base for SMM continues to be broken, as it does not use the address resource allocator has assigned. Change-Id: I79f2ca8427a33a3c719adfe277c24dab79a33ef3 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5235 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/console/console.c')
-rw-r--r--src/console/console.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/console/console.c b/src/console/console.c
index 334e14012a..e09625f251 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -101,12 +101,12 @@ void console_init(void)
#if defined(__BOOT_BLOCK__) && CONFIG_BOOTBLOCK_CONSOLE || \
!defined(__BOOT_BLOCK__) && CONFIG_EARLY_CONSOLE
+#if CONFIG_DRIVERS_OXFORD_OXPCIE
+ oxford_init();
+#endif
#if CONFIG_CONSOLE_SERIAL
uart_init();
#endif
-#if CONFIG_DRIVERS_OXFORD_OXPCIE && CONFIG_CONSOLE_SERIAL8250MEM
- oxford_init();
-#endif
#if CONFIG_CONSOLE_NE2K
ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT);
#endif