sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

console: Unify do_printk()

Browse Source 
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>
This commit is contained in:
Kyösti Mälkki
2014-01-27 15:09:13 +02:00
committed by Patrick Georgi
parent 21333f96c7
commit b2d2596714
5 changed files with 14 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/arch/armv7/early_console.c
View File

@@ -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;
}

25
src/arch/x86/lib/romstage_console.c
View File

@@ -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;
}