From 1d7541feeba372ec3d1d441442238e1c65972bd7 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <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/lib/cbmem.c          | 1 +
 src/lib/cbmem_console.c  | 1 +
 src/lib/coreboot_table.c | 1 +
 src/lib/uart8250.c       | 2 +-
 src/lib/uart8250mem.c    | 2 +-
 5 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c
index 33fa721767..34168e394a 100644
--- a/src/lib/cbmem.c
+++ b/src/lib/cbmem.c
@@ -23,6 +23,7 @@
 #include <bootstate.h>
 #include <cbmem.h>
 #include <console/console.h>
+#include <console/cbmem_console.h>
 #include <arch/early_variables.h>
 #if CONFIG_HAVE_ACPI_RESUME && !defined(__PRE_RAM__)
 #include <arch/acpi.h>
diff --git a/src/lib/cbmem_console.c b/src/lib/cbmem_console.c
index 83d44e3a13..9d5419a185 100644
--- a/src/lib/cbmem_console.c
+++ b/src/lib/cbmem_console.c
@@ -18,6 +18,7 @@
  */
 
 #include <console/console.h>
+#include <console/cbmem_console.h>
 #include <cbmem.h>
 #include <arch/early_variables.h>
 #include <string.h>
diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c
index 667c685981..4d392191a4 100644
--- a/src/lib/coreboot_table.c
+++ b/src/lib/coreboot_table.c
@@ -21,6 +21,7 @@
  */
 
 #include <console/console.h>
+#include <console/uart.h>
 #include <ip_checksum.h>
 #include <boot/coreboot_tables.h>
 #include <string.h>
diff --git a/src/lib/uart8250.c b/src/lib/uart8250.c
index d136eb8867..3171e00d13 100644
--- a/src/lib/uart8250.c
+++ b/src/lib/uart8250.c
@@ -19,7 +19,7 @@
  */
 
 #include <arch/io.h>
-#include <uart.h>
+#include <console/uart.h>
 #include <uart8250.h>
 #include <trace.h>
 
diff --git a/src/lib/uart8250mem.c b/src/lib/uart8250mem.c
index 5e96825834..f35da05ae5 100644
--- a/src/lib/uart8250mem.c
+++ b/src/lib/uart8250mem.c
@@ -19,7 +19,7 @@
  */
 
 #include <arch/io.h>
-#include <uart.h>
+#include <console/uart.h>
 #include <uart8250.h>
 #include <device/device.h>
 #include <delay.h>
-- 
cgit v1.2.3