aboutsummaryrefslogtreecommitdiffstats
path: root/src/console
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-02-26 15:19:04 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-04-18 16:41:09 +0200
commitf3390862653f9473359eb9a587842bb04671e6df (patch)
tree2a6f8171cdac86609b1552e3417816bd6877e4ff /src/console
parente8792be223f5f0c5c6bafffa4056793f3c3bfab7 (diff)
downloadcoreboot-f3390862653f9473359eb9a587842bb04671e6df.tar.gz
coreboot-f3390862653f9473359eb9a587842bb04671e6df.tar.xz
coreboot-f3390862653f9473359eb9a587842bb04671e6df.zip
console: Simplify the enable rules
Consoles on CBMEM and USB have somewhat complex rules and dependencies when they can be active. Use simple variables to test which stage of boot is being built for each console. Change-Id: I2489e7731d07ca7d5dd2ea8b6501c73f05d6edd8 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: http://review.coreboot.org/5341 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'src/console')
-rw-r--r--src/console/console.c62
1 files changed, 17 insertions, 45 deletions
diff --git a/src/console/console.c b/src/console/console.c
index e0e505c04..9b1c25542 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -27,57 +27,29 @@
void console_hw_init(void)
{
-#if CONFIG_CONSOLE_SERIAL
- uart_init();
-#endif
-#if CONFIG_CONSOLE_NE2K
- ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT);
-#endif
-#if CONFIG_CONSOLE_CBMEM && !defined(__BOOT_BLOCK__) && (CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__))
- cbmemc_init();
-#endif
-#if CONFIG_SPKMODEM
- spkmodem_init();
-#endif
-#if CONFIG_CONSOLE_USB && (CONFIG_USBDEBUG_IN_ROMSTAGE || !defined(__PRE_RAM__))
- usbdebug_init();
-#endif
-#if CONFIG_CONSOLE_QEMU_DEBUGCON
- qemu_debugcon_init();
-#endif
+ __cbmemc_init();
+ __spkmodem_init();
+ __qemu_debugcon_init();
+
+ __uart_init();
+ __ne2k_init();
+ __usbdebug_init();
}
void console_tx_byte(unsigned char byte)
{
-#if CONFIG_CONSOLE_SERIAL
- uart_tx_byte(byte);
-#endif
-#if CONFIG_CONSOLE_USB && (CONFIG_USBDEBUG_IN_ROMSTAGE || !defined(__PRE_RAM__))
- usb_tx_byte(0, byte);
-#endif
-#if CONFIG_CONSOLE_NE2K
- ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT);
-#endif
-#if CONFIG_CONSOLE_CBMEM && !defined(__BOOT_BLOCK__) && (CONFIG_EARLY_CBMEM_INIT || !defined(__PRE_RAM__))
- cbmemc_tx_byte(byte);
-#endif
-#if CONFIG_SPKMODEM
- spkmodem_tx_byte(byte);
-#endif
-#if CONFIG_CONSOLE_QEMU_DEBUGCON
- qemu_debugcon_tx_byte(byte);
-#endif
+ __cbmemc_tx_byte(byte);
+ __spkmodem_tx_byte(byte);
+ __qemu_debugcon_tx_byte(byte);
+
+ __uart_tx_byte(byte);
+ __ne2k_tx_byte(byte);
+ __usb_tx_byte(byte);
}
void console_tx_flush(void)
{
-#if CONFIG_CONSOLE_SERIAL
- uart_tx_flush();
-#endif
-#if CONFIG_CONSOLE_NE2K
- ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
-#endif
-#if CONFIG_CONSOLE_USB && (CONFIG_USBDEBUG_IN_ROMSTAGE || !defined(__PRE_RAM__))
- usb_tx_flush(0);
-#endif
+ __uart_tx_flush();
+ __ne2k_tx_flush();
+ __usb_tx_flush();
}