From b2d25967142437a82da150d0134923e3fd783dbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Mon, 27 Jan 2014 15:09:13 +0200
Subject: console: Unify do_printk()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I6c50e47d9d2d0d1f42beee477e49b2a0054d1786
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5332
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
---
 src/arch/armv7/early_console.c      | 21 +--------------------
 src/arch/x86/lib/romstage_console.c | 25 -------------------------
 2 files changed, 1 insertion(+), 45 deletions(-)

(limited to 'src/arch')

diff --git a/src/arch/armv7/early_console.c b/src/arch/armv7/early_console.c
index 7614531c71..a85f554310 100644
--- a/src/arch/armv7/early_console.c
+++ b/src/arch/armv7/early_console.c
@@ -20,7 +20,6 @@
 #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 */
 void console_tx_byte(unsigned char byte)
@@ -36,27 +35,9 @@ void console_tx_byte(unsigned char byte)
 #endif
 }
 
-static void _console_tx_flush(void)
+void console_tx_flush(void)
 {
 #if CONFIG_CONSOLE_SERIAL
 	uart_tx_flush();
 #endif
 }
-
-int do_printk(int msg_level, const char *fmt, ...)
-{
-	va_list args;
-	int i;
-
-	if (msg_level > console_loglevel) {
-		return 0;
-	}
-
-	va_start(args, fmt);
-	i = vtxprintf(console_tx_byte, fmt, args);
-	va_end(args);
-
-	_console_tx_flush();
-
-	return i;
-}
diff --git a/src/arch/x86/lib/romstage_console.c b/src/arch/x86/lib/romstage_console.c
index 0337245ee7..c80cf8c3ff 100644
--- a/src/arch/x86/lib/romstage_console.c
+++ b/src/arch/x86/lib/romstage_console.c
@@ -17,14 +17,12 @@
  * MA 02110-1301 USA
  */
 
-#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>
 
 void console_tx_byte(unsigned char byte)
 {
@@ -60,26 +58,3 @@ void console_tx_flush(void)
 	usb_tx_flush(0);
 #endif
 }
-
-int do_printk(int msg_level, const char *fmt, ...)
-{
-	va_list args;
-	int i;
-
-	if (msg_level > console_loglevel) {
-		return 0;
-	}
-
-#if CONFIG_SQUELCH_EARLY_SMP
-	if (!boot_cpu())
-		return 0;
-#endif
-
-	va_start(args, fmt);
-	i = vtxprintf(console_tx_byte, fmt, args);
-	va_end(args);
-
-	console_tx_flush();
-
-	return i;
-}
-- 
cgit v1.2.3