GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix UART8250 console prototypes 

and disable IO mapped UARTs on ARMV7 per default

Change-Id: I712c4677cbc8519323970556718f9bb6327d83c8
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/2021
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Stefan Reinauer 2012-12-11 12:49:32 -08:00 committed by Stefan Reinauer
parent de48f0fd42
commit 3600e960b6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Kconfig
View File

@ -261,7 +261,8 @@ source src/console/Kconfig
# This should default to N and be set by SuperI/O drivers that have an UART # This should default to N and be set by SuperI/O drivers that have an UART
config HAVE_UART_IO_MAPPED config HAVE_UART_IO_MAPPED
bool bool
default y default y if ARCH_X86
default n if ARCH_ARMV7
config HAVE_UART_MEMORY_MAPPED config HAVE_UART_MEMORY_MAPPED
bool bool

7
src/include/uart8250.h
View File

@ -115,6 +115,7 @@
#define UART_LCS CONFIG_TTYS0_LCS #define UART_LCS CONFIG_TTYS0_LCS
#ifndef __ROMCC__ #ifndef __ROMCC__
#if CONFIG_CONSOLE_SERIAL8250
unsigned char uart8250_rx_byte(unsigned base_port); unsigned char uart8250_rx_byte(unsigned base_port);
int uart8250_can_rx_byte(unsigned base_port); int uart8250_can_rx_byte(unsigned base_port);
void uart8250_tx_byte(unsigned base_port, unsigned char data); void uart8250_tx_byte(unsigned base_port, unsigned char data);
@ -125,6 +126,8 @@ void uart8250_tx_flush(unsigned base_port);
*/ */
void uart8250_init(unsigned base_port, unsigned divisor); void uart8250_init(unsigned base_port, unsigned divisor);
void uart_init(void); void uart_init(void);
#endif
#if CONFIG_CONSOLE_SERIAL8250MEM
void uartmem_init(void); void uartmem_init(void);
/* and the same for memory mapped uarts */ /* and the same for memory mapped uarts */
@ -136,13 +139,13 @@ void uart8250_mem_init(unsigned base_port, unsigned divisor);
u32 uart_mem_init(void); u32 uart_mem_init(void);
u32 uartmem_getbaseaddr(void); u32 uartmem_getbaseaddr(void);
#if defined(__PRE_RAM__) && CONFIG_DRIVERS_OXFORD_OXPCIE && \ #if defined(__PRE_RAM__) && CONFIG_DRIVERS_OXFORD_OXPCIE
CONFIG_CONSOLE_SERIAL8250MEM
/* and special init for OXPCIe based cards */ /* and special init for OXPCIe based cards */
extern int oxford_oxpcie_present; extern int oxford_oxpcie_present;
void oxford_init(void); void oxford_init(void);
#endif #endif
#endif
#endif /* __ROMCC__ */ #endif /* __ROMCC__ */