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/intel/eagleheights/debug.c | 86 ++++++++++------------------- src/mainboard/intel/eagleheights/romstage.c | 6 +- 2 files changed, 34 insertions(+), 58 deletions(-) (limited to 'src/mainboard/intel') diff --git a/src/mainboard/intel/eagleheights/debug.c b/src/mainboard/intel/eagleheights/debug.c index d2c3d586f3..b1346c1435 100644 --- a/src/mainboard/intel/eagleheights/debug.c +++ b/src/mainboard/intel/eagleheights/debug.c @@ -28,11 +28,7 @@ static void print_reg(unsigned char index) outb(index, 0x2e); data = inb(0x2f); - print_debug("0x"); - print_debug_hex8(index); - print_debug(": 0x"); - print_debug_hex8(data); - print_debug("\n"); + printk(BIOS_DEBUG, "0x%02x: 0x%02x\n", index, data); return; } @@ -69,52 +65,49 @@ static inline void siodump(void) int i; unsigned char data; - print_debug("\n*** SERVER I/O REGISTERS ***\n"); + printk(BIOS_DEBUG, "\n*** SERVER I/O REGISTERS ***\n"); for (i=0x10; i<=0x2d; i++) { print_reg((unsigned char)i); } #if 0 - print_debug("\n*** XBUS REGISTERS ***\n"); + printk(BIOS_DEBUG, "\n*** XBUS REGISTERS ***\n"); setup_func(0x0f); for (i=0xf0; i<=0xff; i++) { print_reg((unsigned char)i); } - print_debug("\n*** SERIAL 1 CONFIG REGISTERS ***\n"); + printk(BIOS_DEBUG, "\n*** SERIAL 1 CONFIG REGISTERS ***\n"); setup_func(0x03); print_reg(0xf0); - print_debug("\n*** SERIAL 2 CONFIG REGISTERS ***\n"); + printk(BIOS_DEBUG, "\n*** SERIAL 2 CONFIG REGISTERS ***\n"); setup_func(0x02); print_reg(0xf0); #endif - print_debug("\n*** GPIO REGISTERS ***\n"); + printk(BIOS_DEBUG, "\n*** GPIO REGISTERS ***\n"); setup_func(0x07); for (i=0xf0; i<=0xf8; i++) { print_reg((unsigned char)i); } - print_debug("\n*** GPIO VALUES ***\n"); + printk(BIOS_DEBUG, "\n*** GPIO VALUES ***\n"); data = inb(0x68a); - print_debug("\nGPDO 4: 0x"); - print_debug_hex8(data); + printk(BIOS_DEBUG, "\nGPDO 4: 0x%02x", data); data = inb(0x68b); - print_debug("\nGPDI 4: 0x"); - print_debug_hex8(data); - print_debug("\n"); + printk(BIOS_DEBUG, "\nGPDI 4: 0x%02x\n", data); #if 0 - print_debug("\n*** WATCHDOG TIMER REGISTERS ***\n"); + printk(BIOS_DEBUG, "\n*** WATCHDOG TIMER REGISTERS ***\n"); setup_func(0x0a); print_reg(0xf0); - print_debug("\n*** FAN CONTROL REGISTERS ***\n"); + printk(BIOS_DEBUG, "\n*** FAN CONTROL REGISTERS ***\n"); setup_func(0x09); print_reg(0xf0); print_reg(0xf1); - print_debug("\n*** RTC REGISTERS ***\n"); + printk(BIOS_DEBUG, "\n*** RTC REGISTERS ***\n"); setup_func(0x10); print_reg(0xf0); print_reg(0xf1); @@ -124,7 +117,7 @@ static inline void siodump(void) print_reg(0xfe); print_reg(0xff); - print_debug("\n*** HEALTH MONITORING & CONTROL REGISTERS ***\n"); + printk(BIOS_DEBUG, "\n*** HEALTH MONITORING & CONTROL REGISTERS ***\n"); setup_func(0x14); print_reg(0xf0); #endif @@ -136,27 +129,21 @@ static inline void dump_bar14(unsigned dev) int i; unsigned long bar; - print_debug("BAR 14 Dump\n"); + printk(BIOS_DEBUG, "BAR 14 Dump\n"); bar = pci_read_config32(dev, 0x14); for(i = 0; i <= 0x300; i+=4) { #if 0 unsigned char val; - if ((i & 0x0f) == 0) { - print_debug_hex8(i); - print_debug_char(':'); - } + if ((i & 0x0f) == 0) + printk(BIOS_DEBUG, "%02x:", i); val = pci_read_config8(dev, i); #endif - if((i%4)==0) { - print_debug("\n"); - print_debug_hex16(i); - print_debug_char(' '); - } - print_debug_hex32(read32(bar + i)); - print_debug_char(' '); + if((i%4)==0) + printk(BIOS_DEBUG, "\n%04x ", i); + printk(BIOS_DEBUG, "%08x ", read32(bar + i)); } - print_debug("\n"); + printk(BIOS_DEBUG, "\n"); } static inline void dump_spd_registers(void) @@ -166,28 +153,20 @@ static inline void dump_spd_registers(void) while(device <= DIMM7) { int status = 0; int i; - print_debug("\n"); - print_debug("dimm "); - print_debug_hex8(device); + printk(BIOS_DEBUG, "\ndimm %02x", device); for(i = 0; (i < 256) ; i++) { - if ((i % 16) == 0) { - print_debug("\n"); - print_debug_hex8(i); - print_debug(": "); - } + if ((i % 16) == 0) + printk(BIOS_DEBUG, "\n%02x: ", i); status = smbus_read_byte(device, i); if (status < 0) { - print_debug("bad device: "); - print_debug_hex8(-status); - print_debug("\n"); + printk(BIOS_DEBUG, "bad device: %d\n", -status); break; } - print_debug_hex8(status); - print_debug_char(' '); + printk(BIOS_DEBUG, "%02x ", status); } device++; - print_debug("\n"); + printk(BIOS_DEBUG, "\n"); } } @@ -198,22 +177,17 @@ static inline void dump_ipmi_registers(void) while(device <= 0x42) { int status = 0; int i; - print_debug("\n"); - print_debug("ipmi "); - print_debug_hex8(device); + printk(BIOS_DEBUG, "\nipmi %02x", device); for(i = 0; (i < 8) ; i++) { status = smbus_read_byte(device, 2); if (status < 0) { - print_debug("bad device: "); - print_debug_hex8(-status); - print_debug("\n"); + printk(BIOS_DEBUG, "bad device: %d\n", -status); break; } - print_debug_hex8(status); - print_debug_char(' '); + printk(BIOS_DEBUG, "%02x ", status); } device++; - print_debug("\n"); + printk(BIOS_DEBUG, "\n"); } } diff --git a/src/mainboard/intel/eagleheights/romstage.c b/src/mainboard/intel/eagleheights/romstage.c index b0efb7d0f2..5700162112 100644 --- a/src/mainboard/intel/eagleheights/romstage.c +++ b/src/mainboard/intel/eagleheights/romstage.c @@ -20,14 +20,16 @@ * MA 02110-1301 USA */ -#include #include -#include +#include #include +#include +#include #include #include #include #include +#include #include #include #include "southbridge/intel/i3100/early_smbus.c" -- cgit v1.2.3