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

[coreboot.git] / src / console / console.c

diff --git a/src/console/console.c b/src/console/console.c
index cf6521675a823c2a2817b3e6707300848ac75ea5..c176bc5d0c248091e2b7bb59eab2e0d0d2a21418 100644 (file)
--- a/src/console/console.c
+++ b/src/console/console.c
@@ -8,22 +8,18 @@
 #include <pc80/mc146818rtc.h>
 
 
-static int initialized;
-
 /* initialize the console */
 void console_init(void)
 {
        struct console_driver *driver;
-
-       if (get_option("debug_level", &console_loglevel))
-               console_loglevel = DEFAULT_CONSOLE_LOGLEVEL;
-
+       if(get_option(&console_loglevel, "debug_level"))
+               console_loglevel=CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
+       
        for(driver = console_drivers; driver < econsole_drivers; driver++) {
                if (!driver->init)
                        continue;
                driver->init();
        }
-       initialized = 1;
 }
 
 static void __console_tx_byte(unsigned char byte)
@@ -46,8 +42,6 @@ void console_tx_flush(void)
 
 void console_tx_byte(unsigned char byte)
 {
-       if (!initialized)
-               return;
        if (byte == '\n')
                __console_tx_byte('\r');
        __console_tx_byte(byte);
@@ -56,8 +50,6 @@ void console_tx_byte(unsigned char byte)
 unsigned char console_rx_byte(void)
 {
        struct console_driver *driver;
-       if (!initialized)
-               return 0;
        for(driver = console_drivers; driver < econsole_drivers; driver++) {
                if (driver->tst_byte)
                        break;
@@ -71,8 +63,6 @@ unsigned char console_rx_byte(void)
 int console_tst_byte(void)
 {
        struct console_driver *driver;
-       if (!initialized)
-               return 0;
        for(driver = console_drivers; driver < econsole_drivers; driver++)
                if (driver->tst_byte)
                        return driver->tst_byte();
@@ -84,18 +74,10 @@ int console_tst_byte(void)
  */
 void post_code(uint8_t value)
 {
-#if !defined(NO_POST) || NO_POST==0
+#if !defined(CONFIG_NO_POST) || CONFIG_NO_POST==0
 #if CONFIG_SERIAL_POST==1
        printk_emerg("POST: 0x%02x\n", value);
 #endif
        outb(value, 0x80);
 #endif
 }
-
-/* Report a fatal error */
-void die(const char *msg)
-{
-       printk_emerg("%s", msg);
-       post_code(0xff);
-       while (1);              /* Halt */
-}