4 files changed, 19 insertions, 29 deletions

diff --git a/src/mainboard/lippert/frontrunner/romstage.c b/src/mainboard/lippert/frontrunner/romstage.c
index f86d5580b5..1f33423ab0 100644
--- a/src/mainboard/lippert/frontrunner/romstage.c
+++ b/src/mainboard/lippert/frontrunner/romstage.c
@@ -52,9 +52,8 @@ static inline int spd_read_byte(unsigned int device, unsigned int address)
 
 #if CONFIG_DEBUG_SMBUS
 	if (address >= sizeof(spdbytes) || spdbytes[address] == 0xFF) {
-		print_err("ERROR: spd_read_byte(DIMM0, 0x");
-		print_err_hex8(address);
-		print_err(") returns 0xff\n");
+		printk(BIOS_ERR, "ERROR: spd_read_byte(DIMM0, 0x%02x) "
+			"returns 0xff\n", address);
 	}
 #endif
 
@@ -85,29 +84,29 @@ void main(unsigned long bist)
 	console_init();
 
 	cs5535_early_setup();
-	print_err("done cs5535 early\n");
+	printk(BIOS_ERR, "done cs5535 early\n");
 
 	/* Halt if there was a built in self test failure */
 	report_bist_failure(bist);
 
 	pll_reset();
-	print_err("done pll_reset\n");
+	printk(BIOS_ERR, "done pll_reset\n");
 
 	cpuRegInit();
-	print_err("done cpuRegInit\n");
+	printk(BIOS_ERR, "done cpuRegInit\n");
 
 	sdram_initialize(1, memctrl);
 
-	print_err("Done sdram_initialize\n");
-	print_err("Disable watchdog\n");
+	printk(BIOS_ERR, "Done sdram_initialize\n");
+	printk(BIOS_ERR, "Disable watchdog\n");
 	outb( 0x87, 0x4E);                            //enter SuperIO configuration mode
 	outb( 0x87, 0x4E);
 
    	outb(0x20, 0x4e);
 	temp = inb(0x4f);
-	print_debug_hex8(temp);
+	printk(BIOS_DEBUG, "%02x", temp);
 	if (temp != 0x52){
-		print_err("CAN NOT READ SUPERIO VID\n");
+		printk(BIOS_ERR, "CAN NOT READ SUPERIO VID\n");
 	}
 
 	outb(0x29, 0x4e);
@@ -121,9 +120,9 @@ void main(unsigned long bist)
 	outb( 0xC7, 0x4F);
 	outb( 0xF1, 0x4E);                            //clr GP33 (Bit4) value in cofiguration register F1h to \u20181\u2019 disables
 	temp = inb(0x4F);                            //watchdog function. Make sure to let the other Bits unchanged!
-	print_debug_hex8(temp);print_debug(":");
+	printk(BIOS_DEBUG, "%02x:", temp);
 	temp = temp & ~8;
 	outb( temp, 0x4F);
 	temp = inb(0x4F);                            //watchdog function. Make sure to let the other Bits unchanged!
-	print_debug_hex8(temp);print_debug("\n");
+	printk(BIOS_DEBUG, "%02x\n", temp);
 }
diff --git a/src/mainboard/lippert/hurricane-lx/romstage.c b/src/mainboard/lippert/hurricane-lx/romstage.c
index 8e802f3bee..4172f222b4 100644
--- a/src/mainboard/lippert/hurricane-lx/romstage.c
+++ b/src/mainboard/lippert/hurricane-lx/romstage.c
@@ -141,9 +141,7 @@ void main(unsigned long bist)
 	int err;
 	/* bit0 = Spread Spectrum */
 	if ((err = smc_send_config(SMC_CONFIG))) {
-		print_err("ERROR ");
-		print_err_char('0'+err);
-		print_err(" sending config data to SMC\n");
+		printk(BIOS_ERR, "ERROR %d sending config data to SMC\n", err);
 	}
 #endif
 
diff --git a/src/mainboard/lippert/literunner-lx/romstage.c b/src/mainboard/lippert/literunner-lx/romstage.c
index 919977263e..5cce592878 100644
--- a/src/mainboard/lippert/literunner-lx/romstage.c
+++ b/src/mainboard/lippert/literunner-lx/romstage.c
@@ -84,11 +84,9 @@ int spd_read_byte(unsigned int device, unsigned int address)
 		return 0xFF;	/* No DIMM1, don't even try. */
 
 #if CONFIG_DEBUG_SMBUS
-	if (address >= sizeof(spdbytes) || spdbytes[address] == 0xFF) {
-		print_err("ERROR: spd_read_byte(DIMM0, 0x");
-		print_err_hex8(address);
-		print_err(") returns 0xff\n");
-	}
+	if (address >= sizeof(spdbytes) || spdbytes[address] == 0xFF)
+		printk(BIOS_ERR, "ERROR: spd_read_byte(DIMM0, 0x%02x) "
+			"returns 0xff\n", address);
 #endif
 
 	/* Fake SPD ROM value */
@@ -182,9 +180,7 @@ void main(unsigned long bist)
 
 	/* bit1 = on-board IDE is slave, bit0 = Spread Spectrum */
 	if ((err = smc_send_config(SMC_CONFIG))) {
-		print_err("ERROR ");
-		print_err_char('0'+err);
-		print_err(" sending config data to SMC\n");
+		printk(BIOS_ERR, "ERROR %d sending config data to SMC\n", err);
 	}
 
 	sdram_initialize(1, memctrl);
diff --git a/src/mainboard/lippert/spacerunner-lx/romstage.c b/src/mainboard/lippert/spacerunner-lx/romstage.c
index 2a22140063..99cd29f5da 100644
--- a/src/mainboard/lippert/spacerunner-lx/romstage.c
+++ b/src/mainboard/lippert/spacerunner-lx/romstage.c
@@ -85,9 +85,8 @@ int spd_read_byte(unsigned int device, unsigned int address)
 
 #if CONFIG_DEBUG_SMBUS
 	if (address >= sizeof(spdbytes) || spdbytes[address] == 0xFF) {
-		print_err("ERROR: spd_read_byte(DIMM0, 0x");
-		print_err_hex8(address);
-		print_err(") returns 0xff\n");
+		printk(BIOS_ERR, "ERROR: spd_read_byte(DIMM0, 0x%02x) "
+			"returns 0xff\n", address);
 	}
 #endif
 
@@ -179,9 +178,7 @@ void main(unsigned long bist)
 
 	/* bit1 = on-board IDE is slave, bit0 = Spread Spectrum */
 	if ((err = smc_send_config(SMC_CONFIG))) {
-		print_err("ERROR ");
-		print_err_char('0'+err);
-		print_err(" sending config data to SMC\n");
+		printk(BIOS_ERR, "ERROR %d sending config data to SMC\n", err);
 	}
 
 	sdram_initialize(1, memctrl);