aboutsummaryrefslogtreecommitdiff
path: root/src/include/assert.h
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2015-01-05 13:12:38 -0800
committerKyösti Mälkki <kyosti.malkki@gmail.com>2015-01-09 06:12:22 +0100
commitd6865222c84c9da02cb515329af6a5384638d521 (patch)
tree813e9b2d76cb4d17d68acb505abac4279efbc3ad /src/include/assert.h
parentc62ee70b6ef651288c4c4710319ee313b28fd520 (diff)
misc: Drop print_ implementation from non-romcc boards
Because we had no stack on romcc boards, we had a separate, not as powerful clone of printk: print_*. Back in the day, like more than half a decade ago, we migrated a lot of boards to printk, but we never cleaned up the existing code to be consistent. Instead, we worked around the problem with a very messy console.h (nowadays the mess is hidden in romstage_console.c and early_print.h) This patch cleans up the generic code pieces to use printk() on all non-ROMCC boards. Our two remaining ROMCC boards are fixed up in this commit: bifferos/bifferboard and dmp/vortex86ex. Change-Id: I16676eeabe5c892c8e3c9f3c0cd3bae2e8fd74b6 Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org> Reviewed-on: http://review.coreboot.org/8115 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Andrew Wu <arw@dmp.com.tw> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Diffstat (limited to 'src/include/assert.h')
-rw-r--r--src/include/assert.h27
1 files changed, 0 insertions, 27 deletions
diff --git a/src/include/assert.h b/src/include/assert.h
index 9f624a931f..966449b286 100644
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -22,31 +22,6 @@
#include <console/console.h>
-#if defined(__PRE_RAM__) && !CONFIG_CACHE_AS_RAM
-
-/* ROMCC versions */
-#define ASSERT(x) { \
- if(!(x)) { \
- print_emerg("ASSERTION FAILED: file '"); \
- print_emerg(__FILE__); \
- print_emerg("', line 0x"); \
- print_debug_hex32(__LINE__); \
- print_emerg("\n"); \
- /* die(""); */ \
- } \
-}
-
-#define BUG() { \
- print_emerg("BUG ENCOUNTERED: SYSTEM HALTED at file '");\
- print_emerg(__FILE__); \
- print_emerg("', line 0x"); \
- print_debug_hex32(__LINE__); \
- print_emerg("\n"); \
- /* die(""); */ \
-}
-
-#else
-
/* GCC and CAR versions */
#define ASSERT(x) { \
if (!(x)) { \
@@ -61,8 +36,6 @@
/* die(""); */ \
}
-#endif /* defined(__PRE_RAM__) && !CONFIG_CACHE_AS_RAM */
-
#define assert(statement) ASSERT(statement)
#endif // __ASSERT_H__