From 0364618fe86a7e3ad9b9f79105c66cbefdc64ab6 Mon Sep 17 00:00:00 2001 From: Myles Watson Date: Fri, 16 Oct 2009 19:29:45 +0000 Subject: Change console code to emit SPEW with DEFAULT_CONSOLE_LOGLEVEL==8. Make MAXIMUM_CONSOLE_LOGLEVEL >= DEFAULT_CONSOLE_LOGLEVEL. Signed-off-by: Myles Watson Acked-by: Uwe Hermann Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4794 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/include/console/console.h | 18 +++++++++--------- src/include/console/loglevel.h | 12 ------------ 2 files changed, 9 insertions(+), 21 deletions(-) (limited to 'src/include') diff --git a/src/include/console/console.h b/src/include/console/console.h index 4bebdadb0c..43c8a47fc1 100644 --- a/src/include/console/console.h +++ b/src/include/console/console.h @@ -41,39 +41,39 @@ int do_printk(int msg_level, const char *fmt, ...) __attribute__((format(printf, #define printk_debug(fmt, arg...) do_printk(BIOS_DEBUG ,fmt, ##arg) #define printk_spew(fmt, arg...) do_printk(BIOS_SPEW ,fmt, ##arg) -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_EMERG +#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_EMERG #undef printk_emerg #define printk_emerg(fmt, arg...) do {} while(0) #endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_ALERT +#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_ALERT #undef printk_alert #define printk_alert(fmt, arg...) do {} while(0) #endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_CRIT +#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_CRIT #undef printk_crit #define printk_crit(fmt, arg...) do {} while(0) #endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_ERR +#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_ERR #undef printk_err #define printk_err(fmt, arg...) do {} while(0) #endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_WARNING +#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_WARNING #undef printk_warning #define printk_warning(fmt, arg...) do {} while(0) #endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_NOTICE +#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_NOTICE #undef printk_notice #define printk_notice(fmt, arg...) do {} while(0) #endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_INFO +#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_INFO #undef printk_info #define printk_info(fmt, arg...) do {} while(0) #endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_DEBUG +#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_DEBUG #undef printk_debug #define printk_debug(fmt, arg...) do {} while(0) #endif -#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL <= BIOS_SPEW +#if CONFIG_MAXIMUM_CONSOLE_LOGLEVEL < BIOS_SPEW #undef printk_spew #define printk_spew(fmt, arg...) do {} while(0) #endif diff --git a/src/include/console/loglevel.h b/src/include/console/loglevel.h index a765df2b64..8e6a7c4866 100644 --- a/src/include/console/loglevel.h +++ b/src/include/console/loglevel.h @@ -3,21 +3,9 @@ /* Safe for inclusion in assembly */ -#ifndef CONFIG_MAXIMUM_CONSOLE_LOGLEVEL -#define CONFIG_MAXIMUM_CONSOLE_LOGLEVEL 8 -#endif - -#ifndef CONFIG_DEFAULT_CONSOLE_LOGLEVEL -#define CONFIG_DEFAULT_CONSOLE_LOGLEVEL 8 /* anything MORE serious than BIOS_SPEW */ -#endif - #ifndef ASM_CONSOLE_LOGLEVEL -#if (CONFIG_DEFAULT_CONSOLE_LOGLEVEL <= CONFIG_MAXIMUM_CONSOLE_LOGLEVEL) -#define ASM_CONSOLE_LOGLEVEL CONFIG_DEFAULT_CONSOLE_LOGLEVEL -#else #define ASM_CONSOLE_LOGLEVEL CONFIG_MAXIMUM_CONSOLE_LOGLEVEL #endif -#endif #define BIOS_EMERG 0 /* system is unusable */ #define BIOS_ALERT 1 /* action must be taken immediately */ -- cgit v1.2.3