Add timestamp table pointer to the coreboot table.

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

diff --git a/src/include/assert.h b/src/include/assert.h
index 1c60eaa28786113b0989c3e2a9808361a30b8994..346e76961e8083bc6fbac30542e3be38e3570298 100644 (file)
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -1,12 +1,11 @@
 /*
  * This file is part of the coreboot project.
- * 
+ *
  * Copyright (C) 2010 coresystems GmbH
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of
- * the License.
+ * published by the Free Software Foundation; version 2 of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,14 +14,13 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- * MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #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) {                                            \
@@ -31,7 +29,7 @@
                print_emerg(__FILE__);                          \
                print_emerg("', line 0x");                      \
                print_debug_hex32(__LINE__);                    \
-               print_emerg("\r\n");                            \
+               print_emerg("\n");                              \
                /* die(""); */                                  \
        }                                                       \
 }
@@ -41,7 +39,7 @@
        print_emerg(__FILE__);                                  \
        print_emerg("', line 0x");                              \
        print_debug_hex32(__LINE__);                            \
-       print_emerg("\r\n");                                    \
+       print_emerg("\n");                                      \
        /* die(""); */                                          \
 }
 
@@ -50,17 +48,17 @@
 /* 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(""); */                                          \
 }
 
 #endif
-                                       
-#endif         // __ASSERT_H__
+
+#endif // __ASSERT_H__