Change console code to emit SPEW with DEFAULT_CONSOLE_LOGLEVEL==8.

Make MAXIMUM_CONSOLE_LOGLEVEL >= DEFAULT_CONSOLE_LOGLEVEL.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4794 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

3 files changed, 79 insertions, 67 deletions

diff --git a/src/console/Kconfig b/src/console/Kconfig
index dc11e28cb1..bbf4f9ddaa 100644
--- a/src/console/Kconfig
+++ b/src/console/Kconfig
@@ -79,45 +79,45 @@ config CONSOLE_VGA_ONBOARD_AT_FIRST
 	  If not selected, the last adapter found will be used.
 
 choice
-        prompt "Maximum console log level"
-        default MAXIMUM_CONSOLE_LOGLEVEL_8
+	prompt "Maximum console log level"
+	default MAXIMUM_CONSOLE_LOGLEVEL_8
 
 config MAXIMUM_CONSOLE_LOGLEVEL_8
-        bool "8: SPEW"
-        help
-          Way too many details.
+	bool "8: SPEW"
+	help
+	  Way too many details.
 config MAXIMUM_CONSOLE_LOGLEVEL_7
-        bool "7: DEBUG"
-        help
-          Debug-level messages.
+	bool "7: DEBUG"
+	help
+	  Debug-level messages.
 config MAXIMUM_CONSOLE_LOGLEVEL_6
-        bool "6: INFO"
-        help
-          Informational messages.
+	bool "6: INFO"
+	help
+	  Informational messages.
 config MAXIMUM_CONSOLE_LOGLEVEL_5
-        bool "5: NOTICE"
-        help
-          Normal but significant conditions.
+	bool "5: NOTICE"
+	help
+	  Normal but significant conditions.
 config MAXIMUM_CONSOLE_LOGLEVEL_4
-        bool "4: WARNING"
-        help
-          Warning conditions.
+	bool "4: WARNING"
+	help
+	  Warning conditions.
 config MAXIMUM_CONSOLE_LOGLEVEL_3
-        bool "3: ERR"
-        help
-          Error conditions.
+	bool "3: ERR"
+	help
+	  Error conditions.
 config MAXIMUM_CONSOLE_LOGLEVEL_2
-        bool "2: CRIT"
-        help
-          Critical conditions.
+	bool "2: CRIT"
+	help
+	  Critical conditions.
 config MAXIMUM_CONSOLE_LOGLEVEL_1
-        bool "1: ALERT"
-        help
-          Action must be taken immediately.
+	bool "1: ALERT"
+	help
+	  Action must be taken immediately.
 config MAXIMUM_CONSOLE_LOGLEVEL_0
-        bool "0: EMERG"
-        help
-          System is unusable.
+	bool "0: EMERG"
+	help
+	  System is unusable.
 
 endchoice
 
@@ -136,45 +136,65 @@ config MAXIMUM_CONSOLE_LOGLEVEL
 	  Map the log level config names to an integer.
 
 choice
-        prompt "Default console log level"
-        default DEFAULT_CONSOLE_LOGLEVEL_8
+	prompt "Default console log level"
+	default DEFAULT_CONSOLE_LOGLEVEL_8
 
 config DEFAULT_CONSOLE_LOGLEVEL_8
-        bool "8: SPEW"
-        help
-          Way too many details.
+	bool "8: SPEW"
+	depends on (MAXIMUM_CONSOLE_LOGLEVEL_8)
+	help
+	  Way too many details.
 config DEFAULT_CONSOLE_LOGLEVEL_7
-        bool "7: DEBUG"
-        help
-          Debug-level messages.
+	bool "7: DEBUG"
+	depends on (MAXIMUM_CONSOLE_LOGLEVEL_8 || MAXIMUM_CONSOLE_LOGLEVEL_7)
+	help
+	  Debug-level messages.
 config DEFAULT_CONSOLE_LOGLEVEL_6
-        bool "6: INFO"
-        help
-          Informational messages.
+	bool "6: INFO"
+	depends on (MAXIMUM_CONSOLE_LOGLEVEL_8 || MAXIMUM_CONSOLE_LOGLEVEL_7 ||\
+		    MAXIMUM_CONSOLE_LOGLEVEL_6)
+	help
+	  Informational messages.
 config DEFAULT_CONSOLE_LOGLEVEL_5
-        bool "5: NOTICE"
-        help
-          Normal but significant conditions.
+	bool "5: NOTICE"
+	depends on (MAXIMUM_CONSOLE_LOGLEVEL_8 || MAXIMUM_CONSOLE_LOGLEVEL_7 ||\
+		    MAXIMUM_CONSOLE_LOGLEVEL_6 || MAXIMUM_CONSOLE_LOGLEVEL_5)
+	help
+	  Normal but significant conditions.
 config DEFAULT_CONSOLE_LOGLEVEL_4
-        bool "4: WARNING"
-        help
-          Warning conditions.
+	bool "4: WARNING"
+	depends on (MAXIMUM_CONSOLE_LOGLEVEL_8 || MAXIMUM_CONSOLE_LOGLEVEL_7 ||\
+		    MAXIMUM_CONSOLE_LOGLEVEL_6 || MAXIMUM_CONSOLE_LOGLEVEL_5 ||\
+		    MAXIMUM_CONSOLE_LOGLEVEL_4)
+	help
+	  Warning conditions.
 config DEFAULT_CONSOLE_LOGLEVEL_3
-        bool "3: ERR"
-        help
-          Error conditions.
+	bool "3: ERR"
+	depends on (MAXIMUM_CONSOLE_LOGLEVEL_8 || MAXIMUM_CONSOLE_LOGLEVEL_7 ||\
+		    MAXIMUM_CONSOLE_LOGLEVEL_6 || MAXIMUM_CONSOLE_LOGLEVEL_5 ||\
+		    MAXIMUM_CONSOLE_LOGLEVEL_4 || MAXIMUM_CONSOLE_LOGLEVEL_3)
+	help
+	  Error conditions.
 config DEFAULT_CONSOLE_LOGLEVEL_2
-        bool "2: CRIT"
-        help
-          Critical conditions.
+	bool "2: CRIT"
+	depends on (MAXIMUM_CONSOLE_LOGLEVEL_8 || MAXIMUM_CONSOLE_LOGLEVEL_7 ||\
+		    MAXIMUM_CONSOLE_LOGLEVEL_6 || MAXIMUM_CONSOLE_LOGLEVEL_5 ||\
+		    MAXIMUM_CONSOLE_LOGLEVEL_4 || MAXIMUM_CONSOLE_LOGLEVEL_3 ||\
+		    MAXIMUM_CONSOLE_LOGLEVEL_2)
+	help
+	  Critical conditions.
 config DEFAULT_CONSOLE_LOGLEVEL_1
-        bool "1: ALERT"
-        help
-          Action must be taken immediately.
+	bool "1: ALERT"
+	depends on (MAXIMUM_CONSOLE_LOGLEVEL_8 || MAXIMUM_CONSOLE_LOGLEVEL_7 ||\
+		    MAXIMUM_CONSOLE_LOGLEVEL_6 || MAXIMUM_CONSOLE_LOGLEVEL_5 ||\
+		    MAXIMUM_CONSOLE_LOGLEVEL_4 || MAXIMUM_CONSOLE_LOGLEVEL_3 ||\
+		    MAXIMUM_CONSOLE_LOGLEVEL_2 || MAXIMUM_CONSOLE_LOGLEVEL_1)
+	help
+	  Action must be taken immediately.
 config DEFAULT_CONSOLE_LOGLEVEL_0
-        bool "0: EMERG"
-        help
-          System is unusable.
+	bool "0: EMERG"
+	help
+	  System is unusable.
 
 endchoice
 
diff --git a/src/console/console.c b/src/console/console.c
index 008130fb63..c176bc5d0c 100644
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -81,11 +81,3 @@ void post_code(uint8_t value)
 	outb(value, 0x80);
 #endif
 }
-
-/* Report a fatal error */
-void __attribute__((noreturn)) die(const char *msg)
-{
-	printk_emerg("%s", msg);
-	post_code(0xff);
-	while (1);		/* Halt */
-}
diff --git a/src/console/printk.c b/src/console/printk.c
index 0485a001da..f4157a7b00 100644
--- a/src/console/printk.c
+++ b/src/console/printk.c
@@ -32,7 +32,7 @@ int do_printk(int msg_level, const char *fmt, ...)
 	va_list args;
 	int i;
 
-	if (msg_level >= console_loglevel) {
+	if (msg_level > console_loglevel) {
 		return 0;
 	}