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

uart: Do not guard entire include file by config options 

Do not guard the file by CONFIG_CONSOLE_SERIAL8250 or
CONFIG_CONSOLE_SERIAL8250MEM or CONFIG_CONSOLE_SERIAL.

Don't do indirect includes for <uart8250.h>.

The config-specific options are already properly guarded, and there
is no need to guard the register and bit definitions.

Change-Id: I7528b18cdc62bc5c22486f037e14002838a2176e
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/4585
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Kyösti Mälkki 2014-02-17 11:36:29 +02:00
parent 93fa422dea
commit a172ea5469
5 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/cpu/allwinner/a10/uart.c
View File

@ -7,11 +7,6 @@
#include "uart.h" #include "uart.h"
#include <arch/io.h> #include <arch/io.h>
/* Give me my 8250 UART definitions!!!! */
/* TODO: Clean this up when uart8250mem works on ARM */
#undef CONFIG_CONSOLE_SERIAL8250MEM
#define CONFIG_CONSOLE_SERIAL8250MEM 1
#include <uart8250.h> #include <uart8250.h>
/** /**

14
src/include/uart.h
View File

@ -17,28 +17,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
/* madness. Uarts are a mess. If you include this file, it
* includes ALL uart implementations which may be needed.
* No need to include them separately, and include this file FIRST.
* At least one (but at most one) of the files needs to define
* uart_init().
*/
#ifndef UART_H #ifndef UART_H
#define UART_H #define UART_H
#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM
#include <uart8250.h>
#endif
#if CONFIG_CONSOLE_SERIAL_UART
unsigned char uart_rx_byte(void); unsigned char uart_rx_byte(void);
void uart_tx_byte(unsigned char data); void uart_tx_byte(unsigned char data);
void uart_tx_flush(void); void uart_tx_flush(void);
void uart_init(void); void uart_init(void);
#endif
#if CONFIG_HAVE_UART_MEMORY_MAPPED
uint32_t uartmem_getbaseaddr(void); uint32_t uartmem_getbaseaddr(void);
#endif
#endif /* UART_H */ #endif /* UART_H */

5
src/include/uart8250.h
View File

@ -20,8 +20,6 @@
#ifndef UART8250_H #ifndef UART8250_H
#define UART8250_H #define UART8250_H
#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM
/* Data */ /* Data */
#define UART_RBR 0x00 #define UART_RBR 0x00
#define UART_TBR 0x00 #define UART_TBR 0x00
@ -120,7 +118,6 @@ void uart8250_tx_flush(unsigned base_port);
* have three different sets of uart code, so it's an improvement. * have three different sets of uart code, so it's an improvement.
*/ */
void uart8250_init(unsigned base_port, unsigned divisor); void uart8250_init(unsigned base_port, unsigned divisor);
void uart_init(void);
#endif #endif
#if CONFIG_CONSOLE_SERIAL8250MEM #if CONFIG_CONSOLE_SERIAL8250MEM
void uartmem_init(void); void uartmem_init(void);
@ -141,6 +138,4 @@ void oxford_init(void);
#endif #endif
#endif #endif
#endif /* CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM */
#endif /* UART8250_H */ #endif /* UART8250_H */

1
src/lib/uart8250.c
View File

@ -19,6 +19,7 @@
*/ */
#include <arch/io.h> #include <arch/io.h>
#include <uart.h>
#include <uart8250.h> #include <uart8250.h>
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#include <trace.h> #include <trace.h>

1
src/lib/uart8250mem.c
View File

@ -19,6 +19,7 @@
*/ */
#include <arch/io.h> #include <arch/io.h>
#include <uart.h>
#include <uart8250.h> #include <uart8250.h>
#include <pc80/mc146818rtc.h> #include <pc80/mc146818rtc.h>
#if CONFIG_USE_OPTION_TABLE #if CONFIG_USE_OPTION_TABLE