This patch unifies the use of config options in v2 to all start with CONFIG_

[coreboot.git] / src / cpu / x86 / smm / smihandler.c

diff --git a/src/cpu/x86/smm/smihandler.c b/src/cpu/x86/smm/smihandler.c
index 8d2e22a3815c8d941f8a948b8d329ff8669e1024..96eb5895561e3072c36112c8ddfbca00163a2c2a 100644 (file)
--- a/src/cpu/x86/smm/smihandler.c
+++ b/src/cpu/x86/smm/smihandler.c
@@ -89,7 +89,7 @@ static inline __attribute__((always_inline)) unsigned long nodeid(void)
 
 static int uart_can_tx_byte(void)
 {
-       return inb(TTYS0_BASE + UART_LSR) & 0x20;
+       return inb(CONFIG_TTYS0_BASE + UART_LSR) & 0x20;
 }
 
 static void uart_wait_to_tx_byte(void)
@@ -100,14 +100,14 @@ static void uart_wait_to_tx_byte(void)
 
 static void uart_wait_until_sent(void)
 {
-       while(!(inb(TTYS0_BASE + UART_LSR) & 0x40))
+       while(!(inb(CONFIG_TTYS0_BASE + UART_LSR) & 0x40))
        ; 
 }
 
 static void uart_tx_byte(unsigned char data)
 {
        uart_wait_to_tx_byte();
-       outb(data, TTYS0_BASE + UART_TBR);
+       outb(data, CONFIG_TTYS0_BASE + UART_TBR);
        /* Make certain the data clears the fifos */
        uart_wait_until_sent();
 }
@@ -159,10 +159,6 @@ static void smi_set_eos(void)
 
 void smi_handler(u32 smm_revision)
 {
-       u8 reg8;
-       u16 pmctrl;
-       u16 pm1_sts;
-       u32 smi_sts, gpe0_sts, tco_sts;
        unsigned int node;
        smm_state_save_area_t state_save;
 
@@ -173,12 +169,12 @@ void smi_handler(u32 smm_revision)
        node=nodeid();
 
 #ifdef DEBUG_SMI
-       console_loglevel = DEFAULT_CONSOLE_LOGLEVEL;
+       console_loglevel = CONFIG_DEFAULT_CONSOLE_LOGLEVEL;
 #else
        console_loglevel = 1;
 #endif
 
-       printk_debug("\nSMI# #%d\n", node);
+       printk_spew("\nSMI# #%d\n", node);
 
        switch (smm_revision) {
        case 0x00030007:
@@ -205,6 +201,10 @@ void smi_handler(u32 smm_revision)
                return;
        }
 
+       /* Call chipset specific SMI handlers. This would be the place to
+        * add a CPU or northbridge specific SMI handler, too
+        */
+
        southbridge_smi_handler(node, &state_save);
 
        smi_release_lock();