diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-02-15 10:19:23 +0200 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2014-03-04 15:28:41 +0100 |
| commit | 2b95da01e6bbdd8b001fa1ff2830dbaa70f14c3e (patch) | |
| tree | d4dabf55577b4f01c133a94f506360e79286a777 /src/include | |
| parent | 4770749edca1e54c9a04b48ca6909d786139fa1b (diff) | |
uart8250mem: Unify calls with generic UART
NOTE: UART base for SMM continues to be broken, as it does not use
the address resource allocator has assigned.
Change-Id: I79f2ca8427a33a3c719adfe277c24dab79a33ef3
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5235
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/console/uart.h | 2 | ||||
| -rw-r--r-- | src/include/uart8250.h | 17 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/include/console/uart.h b/src/include/console/uart.h index 8aa8ea24ce..17811cab4c 100644 --- a/src/include/console/uart.h +++ b/src/include/console/uart.h @@ -43,8 +43,10 @@ void uart_tx_flush(void); unsigned char uart_rx_byte(void); int uart_can_rx_byte(void); +unsigned int uart_platform_base(int idx); uint32_t uartmem_getbaseaddr(void); void oxford_init(void); +void oxford_remap(unsigned int new_base); #endif /* CONSOLE_UART_H */ diff --git a/src/include/uart8250.h b/src/include/uart8250.h index 100a216257..c63153c632 100644 --- a/src/include/uart8250.h +++ b/src/include/uart8250.h @@ -105,21 +105,4 @@ #define UART_SCR 0x07 #define UART_SPR 0x07 -#if CONFIG_CONSOLE_SERIAL8250MEM -void uartmem_init(void); - -/* and the same for memory mapped uarts */ -unsigned char uart8250_mem_rx_byte(unsigned base_port); -int uart8250_mem_can_rx_byte(unsigned base_port); -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); - -#if defined(__PRE_RAM__) && CONFIG_DRIVERS_OXFORD_OXPCIE -/* and special init for OXPCIe based cards */ -extern int oxford_oxpcie_present; -#endif -#endif - #endif /* UART8250_H */ |