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>

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 */

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

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)
 {