From f9cdb486d182668e053ca16f115cbc49066d7768 Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Tue, 18 Nov 2014 13:21:50 +0200
Subject: console: Isolate console_init() for ROMCC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I623643834fb1c6af166a851fec7e31447944f0b6
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/7509
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
---
 src/arch/x86/lib/romcc_console.c | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/arch')

diff --git a/src/arch/x86/lib/romcc_console.c b/src/arch/x86/lib/romcc_console.c
index 62490fcb9d..9e0c3c93fc 100644
--- a/src/arch/x86/lib/romcc_console.c
+++ b/src/arch/x86/lib/romcc_console.c
@@ -17,6 +17,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <build.h>
 #include <console/streams.h>
 #include <console/early_print.h>
 
@@ -60,6 +61,20 @@ void console_tx_flush(void)
 }
 
 #include <console/early_print.c>
-#include <console/init.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
+		" starting...\n";
+
+	console_hw_init();
+
+	print_info(console_test);
+}
-- 
cgit v1.2.3