From 5ab52ddc3dc289267b603c0a348c461d336aeaf5 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 5 Jan 2015 13:01:01 -0800 Subject: southbridge: 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 southbridge code to use printk() on all non-ROMCC boards. Change-Id: I312406257e66bbdc3940e206b5256460559a2c98 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/8110 Reviewed-by: Edward O'Callaghan Tested-by: build bot (Jenkins) --- src/southbridge/amd/cs5536/early_setup.c | 12 ++++++------ src/southbridge/amd/cs5536/smbus.c | 6 +----- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'src/southbridge/amd/cs5536') diff --git a/src/southbridge/amd/cs5536/early_setup.c b/src/southbridge/amd/cs5536/early_setup.c index e6ef8ad4e8..ea8b5e030f 100644 --- a/src/southbridge/amd/cs5536/early_setup.c +++ b/src/southbridge/amd/cs5536/early_setup.c @@ -258,18 +258,18 @@ static void cs5536_early_setup(void) msr = rdmsr(GLCP_SYS_RSTPLL); if (msr.lo & (0x3f << 26)) { /* PLL is already set and we are reboot from PLL reset */ - //print_debug("reboot from BIOS reset\n"); + //printk(BIOS_DEBUG, "reboot from BIOS reset\n"); return; } - //print_debug("Setup idsel\n"); + //printk(BIOS_DEBUG, "Setup idsel\n"); cs5536_setup_idsel(); - //print_debug("Setup iobase\n"); + //printk(BIOS_DEBUG, "Setup iobase\n"); cs5536_usb_swapsif(); cs5536_setup_iobase(); - //print_debug("Setup gpio\n"); + //printk(BIOS_DEBUG, "Setup gpio\n"); cs5536_setup_gpio(); - //print_debug("Setup smbus\n"); + //printk(BIOS_DEBUG, "Setup smbus\n"); cs5536_enable_smbus(); - //print_debug("Setup power button\n"); + //printk(BIOS_DEBUG, "Setup power button\n"); cs5536_setup_power_button(); } diff --git a/src/southbridge/amd/cs5536/smbus.c b/src/southbridge/amd/cs5536/smbus.c index 31c5bf124b..3da8389697 100644 --- a/src/southbridge/amd/cs5536/smbus.c +++ b/src/southbridge/amd/cs5536/smbus.c @@ -182,11 +182,7 @@ unsigned char do_smbus_read_byte(unsigned smbus_io_base, return smbus_get_result(smbus_io_base); err: - print_debug("SMBUS READ ERROR:"); - print_debug_hex8(error); - print_debug(" device:"); - print_debug_hex8(device); - print_debug("\n"); + printk(BIOS_DEBUG, "SMBUS READ ERROR: %02x device: %02x\n", error, device); /* stop, clean up the error, and leave */ smbus_stop_condition(smbus_io_base); outb(inb(smbus_io_base + SMB_STS), smbus_io_base + SMB_STS); -- cgit v1.2.3