From a172ea546992c3f6f6a99b4dbaabbdae4c959707 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Mon, 17 Feb 2014 11:36:29 +0200
Subject: [PATCH] uart: Do not guard entire include file by config options
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/cpu/allwinner/a10/uart.c |  5 -----
 src/include/uart.h           | 14 --------------
 src/include/uart8250.h       |  5 -----
 src/lib/uart8250.c           |  1 +
 src/lib/uart8250mem.c        |  1 +
 5 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/src/cpu/allwinner/a10/uart.c b/src/cpu/allwinner/a10/uart.c
index dc98bffbdf..97ac302ddc 100644
--- a/src/cpu/allwinner/a10/uart.c
+++ b/src/cpu/allwinner/a10/uart.c
@@ -7,11 +7,6 @@
 
 #include "uart.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>
 
 /**
diff --git a/src/include/uart.h b/src/include/uart.h
index 9601bfa7c9..b520e09bdb 100644
--- a/src/include/uart.h
+++ b/src/include/uart.h
@@ -17,28 +17,14 @@
  * 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
 #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);
 void uart_tx_byte(unsigned char data);
 void uart_tx_flush(void);
 void uart_init(void);
-#endif
 
-#if CONFIG_HAVE_UART_MEMORY_MAPPED
 uint32_t uartmem_getbaseaddr(void);
-#endif
 
 #endif /* UART_H */
diff --git a/src/include/uart8250.h b/src/include/uart8250.h
index bec3637033..a48c948138 100644
--- a/src/include/uart8250.h
+++ b/src/include/uart8250.h
@@ -20,8 +20,6 @@
 #ifndef UART8250_H
 #define UART8250_H
 
-#if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM
-
 /* Data */
 #define UART_RBR 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.
  */
 void uart8250_init(unsigned base_port, unsigned divisor);
-void uart_init(void);
 #endif
 #if CONFIG_CONSOLE_SERIAL8250MEM
 void uartmem_init(void);
@@ -141,6 +138,4 @@ void oxford_init(void);
 #endif
 #endif
 
-#endif /* CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM */
-
 #endif /* UART8250_H */
diff --git a/src/lib/uart8250.c b/src/lib/uart8250.c
index aa18d2a466..c9075a227a 100644
--- a/src/lib/uart8250.c
+++ b/src/lib/uart8250.c
@@ -19,6 +19,7 @@
  */
 
 #include <arch/io.h>
+#include <uart.h>
 #include <uart8250.h>
 #include <pc80/mc146818rtc.h>
 #include <trace.h>
diff --git a/src/lib/uart8250mem.c b/src/lib/uart8250mem.c
index 1482142da0..040e732df3 100644
--- a/src/lib/uart8250mem.c
+++ b/src/lib/uart8250mem.c
@@ -19,6 +19,7 @@
  */
 
 #include <arch/io.h>
+#include <uart.h>
 #include <uart8250.h>
 #include <pc80/mc146818rtc.h>
 #if CONFIG_USE_OPTION_TABLE