diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-12-07 17:31:37 -0800 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2012-12-08 06:51:59 +0100 |
| commit | 509f77277cfccdae897f0d369672ce0818ecdf88 (patch) | |
| tree | 17bdebd888a5986a041c3d578080b0932b7f78d5 | |
| parent | bb626346ea32479cab9801c183317a383c07196f (diff) | |
WIP: Add support for non-8250 built-in UARTs
Change-Id: I5b412678bb8993633b3a610315d298cb20c705f3
Signed-off-by: David Hendricks <dhendrix@chromium.org>
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/2011
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
| -rw-r--r-- | src/console/Kconfig | 24 | ||||
| -rw-r--r-- | src/include/uart.h | 33 |
2 files changed, 53 insertions, 4 deletions
diff --git a/src/console/Kconfig b/src/console/Kconfig index f4e35286e8..117fdb890a 100644 --- a/src/console/Kconfig +++ b/src/console/Kconfig @@ -1,18 +1,33 @@ menu "Console" -# TODO: Rename to SERIAL_CONSOLE once Kconfig transition is complete. -config CONSOLE_SERIAL8250 +config SERIAL_CONSOLE bool "Serial port console output" + default y + help + Send coreboot debug output to a serial port + +config CONSOLE_SERIAL8250 + bool "Serial port console output (I/O mapped, 8250-compatible)" + depends on SERIAL_CONSOLE depends on HAVE_UART_IO_MAPPED default y help Send coreboot debug output to an I/O mapped serial port console. config CONSOLE_SERIAL8250MEM - bool "Serial port console output (memory mapped)" + bool "Serial port console output (memory mapped, 8250-compatible)" + depends on SERIAL_CONSOLE depends on HAVE_UART_MEMORY_MAPPED help Send coreboot debug output to a memory mapped serial port console. +config CONSOLE_SERIAL_NONSTANDARD_MEM + bool "Serial port console output (memory-mapped, device-specific)" + depends on SERIAL_CONSOLE + depends on HAVE_UART_MEMORY_MAPPED + help + Send coreboot debug output to a memory mapped serial port console + on a device-specific UART. + choice prompt "Serial port" default CONSOLE_SERIAL_COM1 @@ -50,7 +65,7 @@ config TTYS0_BASE choice prompt "Baud rate" default CONSOLE_SERIAL_115200 - depends on CONSOLE_SERIAL8250 || CONSOLE_SERIAL8250MEM + depends on SERIAL_CONSOLE config CONSOLE_SERIAL_115200 bool "115200" @@ -75,6 +90,7 @@ config CONSOLE_SERIAL_9600 endchoice +#FIXME(dhendrix): Change name to SERIAL_BAUD? (Stefan sayz: yes!!) config TTYS0_BAUD int default 115200 if CONSOLE_SERIAL_115200 diff --git a/src/include/uart.h b/src/include/uart.h new file mode 100644 index 0000000000..931d6dce82 --- /dev/null +++ b/src/include/uart.h @@ -0,0 +1,33 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2012 The ChromiumOS Authors. All rights reserved. + * + * 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 + * + * FIXME(dhendrix): This file contains generic prototypes for UART functions. + * The existing headers are too specific to the 8250, so we need a better + * abstraction for use with non-8250 UARTs. + */ + +#ifndef UART_H +#define UART_H + +unsigned char uart_rx_byte(void); +void uart_tx_byte(unsigned char data); +void uart_tx_flush(void); + +void uart_init(void); + +#endif /* UART_H */ |