sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uart8250io: Unify calls with generic UART

Browse Source 
Change-Id: I6d56648e56f2177e1d5332497321e718df18300c
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5234
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Kyösti Mälkki
2014-02-15 07:53:18 +02:00
parent 1d7541feeb
commit 4770749edc
7 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/arch/x86/lib/romcc_console.c
View File

@@ -20,6 +20,7 @@
#include <stdint.h>
#include <console/loglevel.h>
#include <console/post_codes.h>
#include <console/uart.h>
#include <console/ne2k.h>
/* __PRE_RAM__ */
@@ -28,9 +29,6 @@
* we could use the same code on all architectures.
*/
#define console_loglevel CONFIG_DEFAULT_CONSOLE_LOGLEVEL
#if CONFIG_CONSOLE_SERIAL8250
#include <uart8250.h>
#endif
#if CONFIG_CONSOLE_SERIAL8250
#include "drivers/uart/util.c"
@@ -43,7 +41,7 @@
static void __console_tx_byte(unsigned char byte)
{
#if CONFIG_CONSOLE_SERIAL8250
uart8250_tx_byte(CONFIG_TTYS0_BASE, byte);
uart_tx_byte(byte);
#endif
#if CONFIG_CONSOLE_NE2K
ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT);
@@ -64,7 +62,7 @@ static void __console_tx_char(int loglevel, unsigned char byte)
{
if (console_loglevel >= loglevel) {
#if CONFIG_CONSOLE_SERIAL8250
uart8250_tx_byte(CONFIG_TTYS0_BASE, byte);
uart_tx_byte(byte);
#endif
#if CONFIG_CONSOLE_NE2K
ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT);

6
src/arch/x86/lib/romstage_console.c
View File

@@ -26,7 +26,7 @@
#include <console/spkmodem.h>
#include <console/vtxprintf.h>
#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM
#if CONFIG_CONSOLE_SERIAL8250MEM
#include <uart8250.h>
#endif
@@ -42,7 +42,7 @@ void console_tx_byte(unsigned char byte)
}
#endif
#if CONFIG_CONSOLE_SERIAL8250
uart8250_tx_byte(CONFIG_TTYS0_BASE, byte);
uart_tx_byte(byte);
#endif
#if CONFIG_USBDEBUG && (CONFIG_USBDEBUG_IN_ROMSTAGE || !defined(__PRE_RAM__))
usb_tx_byte(0, byte);
@@ -64,7 +64,7 @@ void console_tx_flush(void)
uart8250_mem_tx_flush(CONFIG_OXFORD_OXPCIE_BASE_ADDRESS + 0x1000);
#endif
#if CONFIG_CONSOLE_SERIAL8250
uart8250_tx_flush(CONFIG_TTYS0_BASE);
uart_tx_flush();
#endif
#if CONFIG_CONSOLE_NE2K
ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);