From 65b72ab55d7dff1f13cdf495d345e04e634b97ac Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 5 Jan 2015 12:59:54 -0800 Subject: northbridge: 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 northbridge code to use printk() on all non-ROMCC boards. Change-Id: I4a36cd965c58aae65d74ce1e697dc0d0f58f47a1 Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/7856 Reviewed-by: Edward O'Callaghan Tested-by: build bot (Jenkins) --- src/northbridge/intel/i440bx/debug.c | 26 +++++--------------------- src/northbridge/intel/i440bx/raminit.c | 8 ++++---- 2 files changed, 9 insertions(+), 25 deletions(-) (limited to 'src/northbridge/intel/i440bx') diff --git a/src/northbridge/intel/i440bx/debug.c b/src/northbridge/intel/i440bx/debug.c index ef9d51382a..efd43269e7 100644 --- a/src/northbridge/intel/i440bx/debug.c +++ b/src/northbridge/intel/i440bx/debug.c @@ -35,34 +35,18 @@ void dump_spd_registers(void) } } -static void print_debug_pci_dev(unsigned dev) -{ - print_debug("PCI: "); - print_debug_hex8((dev >> 16) & 0xff); - print_debug_char(':'); - print_debug_hex8((dev >> 11) & 0x1f); - print_debug_char('.'); - print_debug_hex8((dev >> 8) & 7); -} - void dump_pci_device(unsigned dev) { int i; - print_debug_pci_dev(dev); - print_debug("\n"); + printk(BIOS_DEBUG, "PCI: %02x:%02x.%02x\n", (dev >> 20) & 0xff, (dev >> 15) & 0x1f, (dev >> 12) & 7); for (i = 0; i <= 255; i++) { unsigned char val; - if ((i & 0x0f) == 0) { - print_debug_hex8(i); - print_debug_char(':'); - } val = pci_read_config8(dev, i); - print_debug_char(' '); - print_debug_hex8(val); - if ((i & 0x0f) == 0x0f) { - print_debug("\n"); - } + if ((i & 0x0f) == 0) + printk(BIOS_DEBUG, "%02x: %02x", i, val); + if ((i & 0x0f) == 0x0f) + printk(BIOS_DEBUG, "\n"); } } #endif diff --git a/src/northbridge/intel/i440bx/raminit.c b/src/northbridge/intel/i440bx/raminit.c index e3cfbdf256..f191abe13e 100644 --- a/src/northbridge/intel/i440bx/raminit.c +++ b/src/northbridge/intel/i440bx/raminit.c @@ -752,7 +752,7 @@ static void set_dram_row_attributes(void) PRINT_DEBUG("Found DIMM in slot %d\n", i); if (edo && sd) { - print_err("Mixing EDO/SDRAM unsupported!\n"); + printk(BIOS_ERR, "Mixing EDO/SDRAM unsupported!\n"); die("HALT\n"); } @@ -857,11 +857,11 @@ static void set_dram_row_attributes(void) if (col == 4) bpr |= 0xc0; } else { - print_err("# of banks of DIMM unsupported!\n"); + printk(BIOS_ERR, "# of banks of DIMM unsupported!\n"); die("HALT\n"); } if (dra == -1) { - print_err("Page size not supported\n"); + printk(BIOS_ERR, "Page size not supported\n"); die("HALT\n"); } @@ -872,7 +872,7 @@ static void set_dram_row_attributes(void) */ struct dimm_size sz = spd_get_dimm_size(device); if ((sz.side1 < 8)) { - print_err("DIMMs smaller than 8MB per side\n" + printk(BIOS_ERR, "DIMMs smaller than 8MB per side\n" "are not supported on this NB.\n"); die("HALT\n"); } -- cgit v1.2.3