summaryrefslogtreecommitdiff
path: root/src/arch/x86/lib
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2014-02-17 21:34:42 +0200
committerKyösti Mälkki <kyosti.malkki@gmail.com>2014-03-04 15:26:08 +0100
commit1d7541feeba372ec3d1d441442238e1c65972bd7 (patch)
tree03e53d513aa89deaf15e2751cd247cc9cb3d7037 /src/arch/x86/lib
parent7e75f20477511c48f47416caed7301e852165a7f (diff)
downloadcoreboot-1d7541feeba372ec3d1d441442238e1c65972bd7.tar.xz
console: Fix includes
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>
Diffstat (limited to 'src/arch/x86/lib')
-rw-r--r--src/arch/x86/lib/romcc_console.c1
-rw-r--r--src/arch/x86/lib/romstage_console.c14
2 files changed, 6 insertions, 9 deletions
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)
{