Add support to run SMM handler in TSEG instead of ASEG

[coreboot.git] / src / include / assert.h

diff --git a/src/include/assert.h b/src/include/assert.h
index 095023a82179a16628b6c79b381ac2ebf1ae0e5d..346e76961e8083bc6fbac30542e3be38e3570298 100644 (file)
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -20,7 +20,7 @@
 #ifndef __ASSERT_H__
 #define __ASSERT_H__
 
-#if defined(__PRE_RAM__) && !CONFIG_USE_PRINTK_IN_CAR
+#if defined(__PRE_RAM__) && !CONFIG_CACHE_AS_RAM
 
 /* ROMCC versions */
 #define ASSERT(x) {                                            \
@@ -29,7 +29,7 @@
                print_emerg(__FILE__);                          \
                print_emerg("', line 0x");                      \
                print_debug_hex32(__LINE__);                    \
-               print_emerg("\r\n");                            \
+               print_emerg("\n");                              \
                /* die(""); */                                  \
        }                                                       \
 }
@@ -39,7 +39,7 @@
        print_emerg(__FILE__);                                  \
        print_emerg("', line 0x");                              \
        print_debug_hex32(__LINE__);                            \
-       print_emerg("\r\n");                                    \
+       print_emerg("\n");                                      \
        /* die(""); */                                          \
 }
 
@@ -48,13 +48,13 @@
 /* GCC and CAR versions */
 #define ASSERT(x) {                                            \
        if (!(x)) {                                             \
-               printk_emerg("ASSERTION FAILED: file '%s', "    \
+               printk(BIOS_EMERG, "ASSERTION FAILED: file '%s', "      \
                        " line %d\n", __FILE__, __LINE__);      \
                /* die(""); */                                  \
        }                                                       \
 }
 #define BUG() {                                                        \
-       printk_emerg("BUG ENCOUNTERED: SYSTEM HALTED at file '%s', "    \
+       printk(BIOS_EMERG, "BUG ENCOUNTERED: SYSTEM HALTED at file '%s', "      \
                " line %d\n", __FILE__, __LINE__);              \
        /* die(""); */                                          \
 }