David Hendricks (dhendrix@chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2365
-gerrit
commit 18d945f698689a9a4e60ca3c52a531459f9fb790 Author: David Hendricks dhendrix@chromium.org Date: Mon Feb 11 19:23:18 2013 -0800
armv7: add lb_serial entry to coreboot tables
This adds a console entry to the coreboot tables. To accomodate Exynos' "special" uart type, a new LB_TAG_CONSOLE_UART_SPECIAL type was added.
Change-Id: I65009d862e9731b609d09ea215cd0dd774109c11 Signed-off-by: David Hendricks dhendrix@chromium.org --- src/arch/armv7/boot/coreboot_table.c | 10 ++++++---- src/include/boot/coreboot_tables.h | 1 + 2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/arch/armv7/boot/coreboot_table.c b/src/arch/armv7/boot/coreboot_table.c index 64f6a66..bc712b9 100644 --- a/src/arch/armv7/boot/coreboot_table.c +++ b/src/arch/armv7/boot/coreboot_table.c @@ -110,7 +110,7 @@ static struct lb_memory *lb_memory(struct lb_header *header)
static struct lb_serial *lb_serial(struct lb_header *header) { -#if CONFIG_CONSOLE_SERIAL8250 +#if CONFIG_HAVE_UART_IO_MAPPED struct lb_record *rec; struct lb_serial *serial; rec = lb_new_record(header); @@ -121,7 +121,7 @@ static struct lb_serial *lb_serial(struct lb_header *header) serial->baseaddr = CONFIG_TTYS0_BASE; serial->baud = CONFIG_TTYS0_BAUD; return serial; -#elif CONFIG_CONSOLE_SERIAL8250MEM +#elif CONFIG_HAVE_UART_MEMORY_MAPPED if (uartmem_getbaseaddr()) { struct lb_record *rec; struct lb_serial *serial; @@ -141,8 +141,7 @@ static struct lb_serial *lb_serial(struct lb_header *header) #endif }
-#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM || \ - CONFIG_CONSOLE_LOGBUF || CONFIG_USBDEBUG +#if CONFIG_CONSOLE_SERIAL || CONFIG_CONSOLE_LOGBUF || CONFIG_USBDEBUG static void add_console(struct lb_header *header, u16 consoletype) { struct lb_console *console; @@ -162,6 +161,9 @@ static void lb_console(struct lb_header *header) #if CONFIG_CONSOLE_SERIAL8250MEM add_console(header, LB_TAG_CONSOLE_SERIAL8250MEM); #endif +#if CONFIG_HAVE_UART_SPECIAL + add_console(header, LB_TAG_CONSOLE_UART_SPECIAL); +#endif #if CONFIG_CONSOLE_LOGBUF add_console(header, LB_TAG_CONSOLE_LOGBUF); #endif diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index 9cf90d3..04427d2 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -167,6 +167,7 @@ struct lb_console { #define LB_TAG_CONSOLE_SROM 4 // OBSOLETE #define LB_TAG_CONSOLE_EHCI 5 #define LB_TAG_CONSOLE_SERIAL8250MEM 6 +#define LB_TAG_CONSOLE_UART_SPECIAL 7
#define LB_TAG_FORWARD 0x0011 struct lb_forward {