From 1d7541feeba372ec3d1d441442238e1c65972bd7 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 21:34:42 +0200
Subject: console: Fix includes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Do not pull in console hw-specific prototypes everywhere
with console.h as those are not needed for higher levels.

Move prototypes for UARTs next to other consoles.

Change-Id: Icbc9cd3e5bdfdab85d7dccd7c3827bba35248fb8
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5232
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
---
 src/drivers/oxford/oxpcie/oxpcie.c       | 1 +
 src/drivers/oxford/oxpcie/oxpcie_early.c | 2 +-
 src/drivers/uart/pl011.c                 | 2 +-
 src/drivers/uart/util.c                  | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/oxford/oxpcie/oxpcie.c b/src/drivers/oxford/oxpcie/oxpcie.c
index f719fc7f2d..26d29f858b 100644
--- a/src/drivers/oxford/oxpcie/oxpcie.c
+++ b/src/drivers/oxford/oxpcie/oxpcie.c
@@ -22,6 +22,7 @@
 #include <device/pci.h>
 #include <device/pci_ids.h>
 #include <console/console.h>
+#include <uart8250.h>
 #include <arch/io.h>
 
 static void oxford_oxpcie_enable(device_t dev)
diff --git a/src/drivers/oxford/oxpcie/oxpcie_early.c b/src/drivers/oxford/oxpcie/oxpcie_early.c
index 4f6f9649f5..edb0523e52 100644
--- a/src/drivers/oxford/oxpcie/oxpcie_early.c
+++ b/src/drivers/oxford/oxpcie/oxpcie_early.c
@@ -21,7 +21,7 @@
 #include <arch/io.h>
 #include <arch/early_variables.h>
 #include <delay.h>
-#include <uart.h>
+#include <console/uart.h>
 #include <uart8250.h>
 #include <device/pci_def.h>
 
diff --git a/src/drivers/uart/pl011.c b/src/drivers/uart/pl011.c
index af085acbea..376e95c0c8 100644
--- a/src/drivers/uart/pl011.c
+++ b/src/drivers/uart/pl011.c
@@ -14,7 +14,7 @@
  */
 
 #include <console/console.h>
-#include <uart.h>
+#include <console/uart.h>
 
 static void pl011_uart_tx_byte(unsigned char data)
 {
diff --git a/src/drivers/uart/util.c b/src/drivers/uart/util.c
index e09b686a9c..72bf50e72b 100644
--- a/src/drivers/uart/util.c
+++ b/src/drivers/uart/util.c
@@ -16,7 +16,7 @@
  */
 
 #include <console/console.h>
-#include <uart.h>
+#include <console/uart.h>
 #if CONFIG_USE_OPTION_TABLE
 #include <option.h>
 #include "option_table.h"
-- 
cgit v1.2.3