From d6865222c84c9da02cb515329af6a5384638d521 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 5 Jan 2015 13:12:38 -0800 Subject: misc: Drop print_ implementation from non-romcc boards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: http://review.coreboot.org/8115 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Andrew Wu Reviewed-by: Kyösti Mälkki --- src/include/assert.h | 27 --------------------------- 1 file changed, 27 deletions(-) (limited to 'src/include/assert.h') 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 -#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__ -- cgit v1.2.3