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

console: Use single driver entry for UARTs

Browse Source 
UARTs now have unified prototypes and can use a single entry
in the list of drivers for ramstage.

Change-Id: I315daaf9a83cfa60f1a270146c729907a1d6d45b
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5308
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Kyösti Mälkki
2014-02-14 10:31:38 +02:00
parent ab94bbf072
commit 0567c91b22
9 changed files with 29 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/console/Makefile.inc
View File

@ -17,8 +17,7 @@ bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += vtxprintf.c
bootblock-y += console.c
bootblock-y += die.c
ramstage-$(CONFIG_CONSOLE_SERIAL8250) += uart8250_console.c
ramstage-$(CONFIG_CONSOLE_SERIAL8250MEM) += uart8250mem_console.c
ramstage-$(CONFIG_CONSOLE_SERIAL) += uart_console.c
ramstage-$(CONFIG_SPKMODEM) += spkmodem_console.c
ramstage-$(CONFIG_CONSOLE_USB) += usbdebug_console.c
ramstage-$(CONFIG_CONSOLE_NE2K) += ne2k_console.c

54
src/console/uart8250_console.c
View File

@ -1,54 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2003 Eric Biederman
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; version 2 of the License.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include <console/console.h>
#include <console/uart.h>
static void ttyS0_init(void)
{
uart_init();
}
static void ttyS0_tx_byte(unsigned char data)
{
uart_tx_byte(data);
}
static void ttyS0_tx_flush(void)
{
uart_tx_flush();
}
static unsigned char ttyS0_rx_byte(void)
{
return uart_rx_byte();
}
static int ttyS0_tst_byte(void)
{
return uart_can_rx_byte();
}
static const struct console_driver uart8250_console __console = {
.init = ttyS0_init,
.tx_byte = ttyS0_tx_byte,
.tx_flush = ttyS0_tx_flush,
.rx_byte = ttyS0_rx_byte,
.tst_byte = ttyS0_tst_byte,
};

7
src/console/uart8250mem_console.c → src/console/uart_console.c
View File

@ -40,12 +40,17 @@ static unsigned char uartmem_rx_byte(void)
return uart_rx_byte();
}
/* This only relevant with x86 with GDB_STUB enabled.*/
static int uartmem_tst_byte(void)
{
#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM
return uart_can_rx_byte();
#else
return 0;
#endif
}
static const struct console_driver uart8250mem_console __console = {
static const struct console_driver uart_console __console = {
.init = uartmem_init,
.tx_byte = uartmem_tx_byte,
.tx_flush = uartmem_tx_flush,