x86: flatten hierarchy4.14.1

It never made sense to have bootblock_* in init, but
pirq_routing.c in boot, and some ld scripts on the main
level while others live in subdirectories.

This patch flattens the directory hierarchy and makes
x86 more similar to the other architectures.

Change-Id: I4056038fe7813e4d3d3042c441e7ab6076a36384
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10901
Tested-by: build bot (Jenkins)
Tested-by: Raptor Engineering Automated Test Stand <noreply@raptorengineeringinc.com>
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>

1 files changed, 87 insertions, 0 deletions

diff --git a/src/arch/x86/romcc_console.c b/src/arch/x86/romcc_console.c
new file mode 100644
index 0000000..bfc35bc
--- /dev/null
+++ b/src/arch/x86/romcc_console.c
@@ -0,0 +1,87 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2003 Eric Biederman
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc.
+ */
+
+#include <build.h>
+#include <console/streams.h>
+#include <console/early_print.h>
+#include <console/loglevel.h>
+
+/* Include the sources. */
+#if CONFIG_CONSOLE_SERIAL && CONFIG_DRIVERS_UART_8250IO
+#include "drivers/uart/util.c"
+#include "drivers/uart/uart8250io.c"
+#endif
+#if CONFIG_CONSOLE_NE2K
+#include "drivers/net/ne2k.c"
+#endif
+
+void console_hw_init(void)
+{
+#if CONFIG_CONSOLE_SERIAL
+	uart_init(CONFIG_UART_FOR_CONSOLE);
+#endif
+#if CONFIG_CONSOLE_NE2K
+	ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT);
+#endif
+}
+
+void console_tx_byte(unsigned char byte)
+{
+#if CONFIG_CONSOLE_SERIAL
+	uart_tx_byte(CONFIG_UART_FOR_CONSOLE, byte);
+#endif
+#if CONFIG_CONSOLE_NE2K
+	ne2k_append_data_byte(byte, CONFIG_CONSOLE_NE2K_IO_PORT);
+#endif
+}
+
+void console_tx_flush(void)
+{
+#if CONFIG_CONSOLE_SERIAL
+	uart_tx_flush(CONFIG_UART_FOR_CONSOLE);
+#endif
+#if CONFIG_CONSOLE_NE2K
+	ne2k_transmit(CONFIG_CONSOLE_NE2K_IO_PORT);
+#endif
+}
+
+#include <console/early_print.c>
+#include <console/post.c>
+#include <console/die.c>
+
+void console_init(void)
+{
+	static const char console_test[] =
+		"\n\ncoreboot-"
+		COREBOOT_VERSION
+		COREBOOT_EXTRA_VERSION
+		" "
+		COREBOOT_BUILD
+		" romstage starting...\n";
+
+	console_hw_init();
+
+	print_info(console_test);
+}
+
+void die(const char *msg)
+{
+	print_emerg(msg);
+	halt();
+}