From 56ae13983bae2ba4214dd635c46afad7e7bc50c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Fri, 28 Feb 2014 14:37:27 +0200 Subject: console: Hide global console_loglevel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7bdc468bc3f74516abb2c583bdb5b6d7555d987c Signed-off-by: Kyösti Mälkki Reviewed-on: http://review.coreboot.org/5333 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- src/console/init.c | 10 ++++++++-- src/console/printk.c | 3 +-- 2 files changed, 9 insertions(+), 4 deletions(-) (limited to 'src/console') diff --git a/src/console/init.c b/src/console/init.c index c6ceab54c2..d7c8cc36b0 100644 --- a/src/console/init.c +++ b/src/console/init.c @@ -29,8 +29,14 @@ #include #endif -#if !defined(__PRE_RAM__) -int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; +#if !defined(__ROMCC__) +/* While in romstage, console loglevel is built-time constant. */ +static ROMSTAGE_CONST int console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL; + +int console_log_level(int msg_level) +{ + return (console_loglevel >= msg_level); +} #endif void console_init(void) diff --git a/src/console/printk.c b/src/console/printk.c index 7ea8c06937..fb1194e828 100644 --- a/src/console/printk.c +++ b/src/console/printk.c @@ -18,9 +18,8 @@ int do_printk(int msg_level, const char *fmt, ...) va_list args; int i; - if (msg_level > console_loglevel) { + if (!console_log_level(msg_level)) return 0; - } #if CONFIG_SQUELCH_EARLY_SMP && defined(__PRE_RAM__) if (!boot_cpu()) -- cgit v1.2.3