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/arch/armv7/early_console.c      |  2 ++
 src/arch/x86/lib/romcc_console.c    |  1 +
 src/arch/x86/lib/romstage_console.c | 14 +++++---------
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/arch')

diff --git a/src/arch/armv7/early_console.c b/src/arch/armv7/early_console.c
index b6339fcbf3..93ea38d43a 100644
--- a/src/arch/armv7/early_console.c
+++ b/src/arch/armv7/early_console.c
@@ -18,6 +18,8 @@
  */
 
 #include <console/console.h>
+#include <console/cbmem_console.h>
+#include <console/uart.h>
 #include <console/vtxprintf.h>
 
 /* FIXME: need to make console driver more generic */
diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/lib/romcc_console.c
index c5e688258b..52b8a872a5 100644
--- a/src/arch/x86/lib/romcc_console.c
+++ b/src/arch/x86/lib/romcc_console.c
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <console/loglevel.h>
 #include <console/post_codes.h>
+#include <console/ne2k.h>
 
 /* __PRE_RAM__ */
 /* Using a global varible can cause problems when we reset the stack
diff --git a/src/arch/x86/lib/romstage_console.c b/src/arch/x86/lib/romstage_console.c
index 4ef702f603..4981f39ee7 100644
--- a/src/arch/x86/lib/romstage_console.c
+++ b/src/arch/x86/lib/romstage_console.c
@@ -19,20 +19,16 @@
 
 #include <smp/node.h>
 #include <console/console.h>
+#include <console/cbmem_console.h>
+#include <console/uart.h>
+#include <console/usb.h>
+#include <console/ne2k.h>
+#include <console/spkmodem.h>
 #include <console/vtxprintf.h>
 
 #if CONFIG_CONSOLE_SERIAL8250 || CONFIG_CONSOLE_SERIAL8250MEM
 #include <uart8250.h>
 #endif
-#if CONFIG_USBDEBUG
-#include <console/usb.h>
-#endif
-#if CONFIG_CONSOLE_NE2K
-#include <console/ne2k.h>
-#endif
-#if CONFIG_SPKMODEM
-#include <console/spkmodem.h>
-#endif
 
 void console_tx_byte(unsigned char byte)
 {
-- 
cgit v1.2.3