diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2011-06-22 16:39:19 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2011-10-21 23:34:30 +0200 |
| commit | d1bc331855caab351a70676b5085787292a45fea (patch) | |
| tree | 8d0ddcf777c4b7330e02495982f1f718f56d27fc /src | |
| parent | b6010b8e70c25f93773bc464457f69fd4bb8a82e (diff) | |
Extend coreboot table entry for serial ports
Add information about memory mapped/io mapped base addresses.
and fix up libpayload to use the same structures
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Change-Id: I5f7b5eda6063261b9acb7a46310172d4a5471dfb
Reviewed-on: http://review.coreboot.org/261
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch/x86/boot/coreboot_table.c | 15 | ||||
| -rw-r--r-- | src/console/uart8250mem_console.c | 5 | ||||
| -rw-r--r-- | src/include/boot/coreboot_tables.h | 5 | ||||
| -rw-r--r-- | src/include/uart8250.h | 1 |
4 files changed, 23 insertions, 3 deletions
diff --git a/src/arch/x86/boot/coreboot_table.c b/src/arch/x86/boot/coreboot_table.c index cdfc0c1d8d..78ff97d21b 100644 --- a/src/arch/x86/boot/coreboot_table.c +++ b/src/arch/x86/boot/coreboot_table.c @@ -112,7 +112,19 @@ static struct lb_serial *lb_serial(struct lb_header *header) serial = (struct lb_serial *)rec; serial->tag = LB_TAG_SERIAL; serial->size = sizeof(*serial); - serial->ioport = CONFIG_TTYS0_BASE; + serial->type = LB_SERIAL_TYPE_IO_MAPPED; + serial->baseaddr = CONFIG_TTYS0_BASE; + serial->baud = CONFIG_TTYS0_BAUD; + return serial; +#elif CONFIG_CONSOLE_SERIAL8250MEM + struct lb_record *rec; + struct lb_serial *serial; + rec = lb_new_record(header); + serial = (struct lb_serial *)rec; + serial->tag = LB_TAG_SERIAL; + serial->size = sizeof(*serial); + serial->type = LB_SERIAL_TYPE_MEMORY_MAPPED; + serial->baseaddr = uartmem_getbaseaddr(); serial->baud = CONFIG_TTYS0_BAUD; return serial; #else @@ -131,7 +143,6 @@ static void add_console(struct lb_header *header, u16 consoletype) console->size = sizeof(*console); console->type = consoletype; } - #endif static void lb_console(struct lb_header *header) diff --git a/src/console/uart8250mem_console.c b/src/console/uart8250mem_console.c index e622ad090c..923df99df1 100644 --- a/src/console/uart8250mem_console.c +++ b/src/console/uart8250mem_console.c @@ -28,6 +28,11 @@ static void uartmem_init(void) uart_bar = uart_mem_init(); } +u32 uartmem_getbaseaddr(void) +{ + return uart_bar; +} + static void uartmem_tx_byte(unsigned char data) { if (!uart_bar) diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index 983b03f602..45ba3af110 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -146,7 +146,10 @@ struct lb_string { struct lb_serial { uint32_t tag; uint32_t size; - uint16_t ioport; +#define LB_SERIAL_TYPE_IO_MAPPED 1 +#define LB_SERIAL_TYPE_MEMORY_MAPPED 2 + uint32_t type; + uint32_t baseaddr; uint32_t baud; }; diff --git a/src/include/uart8250.h b/src/include/uart8250.h index 4a02179210..3c8ea09291 100644 --- a/src/include/uart8250.h +++ b/src/include/uart8250.h @@ -146,6 +146,7 @@ void uart8250_mem_tx_byte(unsigned base_port, unsigned char data); void uart8250_mem_tx_flush(unsigned base_port); void uart8250_mem_init(unsigned base_port, unsigned divisor); u32 uart_mem_init(void); +u32 uartmem_getbaseaddr(void); /* and special init for OXPCIe based cards */ void oxford_init(void); |