GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

console: rename do_vtxprintf to do_printk_va_list and use it 

The name is more consistent with what we have elsewhere,
and the callsite didn't build at all (with vboot enabled)

Change-Id: I3576f3b8f737d360f68b67b6ce1683199948776d
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: http://review.coreboot.org/10096
Tested-by: build bot (Jenkins)
This commit is contained in:
Aaron Durbin 2015-05-01 16:48:54 -05:00 committed by Patrick Georgi
parent ed98eeea84
commit 8fb36c07ac
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/console/printk.c
View File

@ -54,8 +54,10 @@ int do_printk(int msg_level, const char *fmt, ...)
}
#if IS_ENABLED (CONFIG_CHROMEOS)
void do_vtxprintf(const char *fmt, va_list args)
void do_printk_va_list(int msg_level, const char *fmt, va_list args)
{
if (!console_log_level(msg_level))
return;
vtxprintf(wrap_putchar, fmt, args, NULL);
console_tx_flush();
}

4
src/include/console/console.h
View File

@ -80,9 +80,9 @@ static inline void do_putchar(unsigned char byte) {}
/* FIXME: Collision of varargs with AMD headers without guard. */
#include <console/vtxprintf.h>
#if __CONSOLE_ENABLE__
void do_vtxprintf(const char *fmt, va_list args);
void do_printk_va_list(int msg_level, const char *fmt, va_list args);
#else
static inline void do_vtxprintf(const char *fmt, va_list args) {};
static inline void do_printk_va_list(int l, const char *fmt, va_list args) {}
#endif
#endif

2
src/vendorcode/google/chromeos/vboot2/verstage.c
View File

@ -45,7 +45,7 @@ void vb2ex_printf(const char *func, const char *fmt, ...)
printk(BIOS_INFO, "VB2:%s() ", func);
va_start(args, fmt);
vprintk(BIOS_INFO, fmt, args);
do_printk_va_list(BIOS_INFO, fmt, args);
va_end(args);
return;