diff options
| author | Aaron Durbin <adurbin@chromium.org> | 2015-05-01 16:48:54 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-05-05 17:46:35 +0200 |
| commit | 8fb36c07ac4eb34da61894bba260ab57c4b7f9db (patch) | |
| tree | 97b9dbe4bc0355d6847efb4e5946e912478272d8 | |
| parent | ed98eeea8451f7f9a320525e73fb448371adb34f (diff) | |
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)
| -rw-r--r-- | src/console/printk.c | 4 | ||||
| -rw-r--r-- | src/include/console/console.h | 4 | ||||
| -rw-r--r-- | src/vendorcode/google/chromeos/vboot2/verstage.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/console/printk.c b/src/console/printk.c index 10a7da21f3..aab7ff5f67 100644 --- a/src/console/printk.c +++ b/src/console/printk.c @@ -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(); } diff --git a/src/include/console/console.h b/src/include/console/console.h index b0971e5323..ad93a9af9c 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -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 diff --git a/src/vendorcode/google/chromeos/vboot2/verstage.c b/src/vendorcode/google/chromeos/vboot2/verstage.c index c62c102c45..019208df4e 100644 --- a/src/vendorcode/google/chromeos/vboot2/verstage.c +++ b/src/vendorcode/google/chromeos/vboot2/verstage.c @@ -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; |