From 069f4766a013929fa7570194925978b55b8253df Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 5 Jan 2015 13:02:32 -0800 Subject: mainboard: 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 mainboard code to use printk() on all non-ROMCC boards. Change-Id: I2383f24343fc2041fef4af65d717d754ad58425e Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/8111 Reviewed-by: Edward O'Callaghan Tested-by: build bot (Jenkins) --- src/mainboard/pcengines/alix1c/romstage.c | 16 ++++++---------- src/mainboard/pcengines/alix2d/romstage.c | 16 ++++++---------- 2 files changed, 12 insertions(+), 20 deletions(-) (limited to 'src/mainboard/pcengines') diff --git a/src/mainboard/pcengines/alix1c/romstage.c b/src/mainboard/pcengines/alix1c/romstage.c index 38541e7c51..45f531dd77 100644 --- a/src/mainboard/pcengines/alix1c/romstage.c +++ b/src/mainboard/pcengines/alix1c/romstage.c @@ -83,19 +83,15 @@ static const u8 spdbytes[] = { int spd_read_byte(unsigned int device, unsigned int address) { - print_debug("spd_read_byte dev "); - print_debug_hex8(device); + printk(BIOS_DEBUG, "spd_read_byte dev %02x", device); if (device != DIMM0) { - print_debug(" returns 0xff\n"); + printk(BIOS_DEBUG, " returns 0xff\n"); return 0xff; } - print_debug(" addr "); - print_debug_hex8(address); - print_debug(" returns "); - print_debug_hex8(spdbytes[address]); - print_debug("\n"); + printk(BIOS_DEBUG, " addr %02x returns %02x\n", + address, spdbytes[address]); return spdbytes[address]; } @@ -156,9 +152,9 @@ void main(unsigned long bist) * We use method 1 on Norwich and on this board too. */ post_code(0x02); - print_err("POST 02\n"); + printk(BIOS_ERR, "POST 02\n"); __asm__("wbinvd\n"); - print_err("Past wbinvd\n"); + printk(BIOS_ERR, "Past wbinvd\n"); /* We are finding the return does not work on this board. Explicitly * call the label that is after the call to us. This is gross, but diff --git a/src/mainboard/pcengines/alix2d/romstage.c b/src/mainboard/pcengines/alix2d/romstage.c index 6f62311b00..c46aa0c5cd 100644 --- a/src/mainboard/pcengines/alix2d/romstage.c +++ b/src/mainboard/pcengines/alix2d/romstage.c @@ -81,19 +81,15 @@ static const u8 spdbytes[] = { int spd_read_byte(unsigned int device, unsigned int address) { - print_debug("spd_read_byte dev "); - print_debug_hex8(device); + printk(BIOS_DEBUG, "spd_read_byte dev %02x", device); if (device != DIMM0) { - print_debug(" returns 0xff\n"); + printk(BIOS_DEBUG, " returns 0xff\n"); return 0xff; } - print_debug(" addr "); - print_debug_hex8(address); - print_debug(" returns "); - print_debug_hex8(spdbytes[address]); - print_debug("\n"); + printk(BIOS_DEBUG, " addr %02x returns %02x\n", + address, spdbytes[address]); return spdbytes[address]; } @@ -179,9 +175,9 @@ void main(unsigned long bist) * We use method 1 on Norwich and on this board too. */ post_code(0x02); - print_err("POST 02\n"); + printk(BIOS_ERR, "POST 02\n"); __asm__("wbinvd\n"); - print_err("Past wbinvd\n"); + printk(BIOS_ERR, "Past wbinvd\n"); /* We are finding the return does not work on this board. Explicitly * call the label that is after the call to us. This is gross, but -- cgit v1.2.3