printk_foo -> printk(BIOS_FOO, ...)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5266 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

8 files changed, 54 insertions, 54 deletions

diff --git a/src/mainboard/roda/rk886ex/acpi_tables.c b/src/mainboard/roda/rk886ex/acpi_tables.c
index 34faf63e16..30c479c513 100644
--- a/src/mainboard/roda/rk886ex/acpi_tables.c
+++ b/src/mainboard/roda/rk886ex/acpi_tables.c
@@ -219,7 +219,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	/* Align ACPI tables to 16byte */
 	ALIGN_CURRENT;
 
-	printk_info("ACPI: Writing ACPI tables at %lx.\n", start);
+	printk(BIOS_INFO, "ACPI: Writing ACPI tables at %lx.\n", start);
 
 	/* We need at least an RSDP and an RSDT Table */
 	rsdp = (acpi_rsdp_t *) current;
@@ -242,7 +242,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	/*
 	 * We explicitly add these tables later on:
 	 */
-	printk_debug("ACPI:    * HPET\n");
+	printk(BIOS_DEBUG, "ACPI:    * HPET\n");
 
 	hpet = (acpi_hpet_t *) current;
 	current += sizeof(acpi_hpet_t);
@@ -251,7 +251,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	acpi_add_table(rsdp, hpet);
 
 	/* If we want to use HPET Timers Linux wants an MADT */
-	printk_debug("ACPI:    * MADT\n");
+	printk(BIOS_DEBUG, "ACPI:    * MADT\n");
 
 	madt = (acpi_madt_t *) current;
 	acpi_create_madt(madt);
@@ -259,14 +259,14 @@ unsigned long write_acpi_tables(unsigned long start)
 	ALIGN_CURRENT;
 	acpi_add_table(rsdp, madt);
 
-	printk_debug("ACPI:    * MCFG\n");
+	printk(BIOS_DEBUG, "ACPI:    * MCFG\n");
 	mcfg = (acpi_mcfg_t *) current;
 	acpi_create_mcfg(mcfg);
 	current += mcfg->header.length;
 	ALIGN_CURRENT;
 	acpi_add_table(rsdp, mcfg);
 
-	printk_debug("ACPI:     * FACS\n");
+	printk(BIOS_DEBUG, "ACPI:     * FACS\n");
 	facs = (acpi_facs_t *) current;
 	current += sizeof(acpi_facs_t);
 	ALIGN_CURRENT;
@@ -303,7 +303,7 @@ unsigned long write_acpi_tables(unsigned long start)
 	/* Pack GNVS into the ACPI table area */
 	for (i=0; i < dsdt->length; i++) {
 		if (*(u32*)(((u32)dsdt) + i) == 0xC0DEBABE) {
-			printk_debug("ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, (u32)current);
+			printk(BIOS_DEBUG, "ACPI: Patching up global NVS in DSDT at offset 0x%04x -> 0x%08x\n", i, (u32)current);
 			*(u32*)(((u32)dsdt) + i) = current; // 0x92 bytes
 			break;
 		}
@@ -325,18 +325,18 @@ unsigned long write_acpi_tables(unsigned long start)
 	dsdt->checksum = 0;
 	dsdt->checksum = acpi_checksum((void *)dsdt, dsdt->length);
 
-	printk_debug("ACPI:     * DSDT @ %p Length %x\n", dsdt,
+	printk(BIOS_DEBUG, "ACPI:     * DSDT @ %p Length %x\n", dsdt,
 		     dsdt->length);
 
 #if CONFIG_HAVE_ACPI_SLIC
-	printk_debug("ACPI:     * SLIC\n");
+	printk(BIOS_DEBUG, "ACPI:     * SLIC\n");
 	slic = (acpi_header_t *)current;
 	current += acpi_create_slic(current);
 	ALIGN_CURRENT;
 	acpi_add_table(rsdp, slic);
 #endif
 
-	printk_debug("ACPI:     * FADT\n");
+	printk(BIOS_DEBUG, "ACPI:     * FADT\n");
 	fadt = (acpi_fadt_t *) current;
 	current += sizeof(acpi_fadt_t);
 	ALIGN_CURRENT;
@@ -344,16 +344,16 @@ unsigned long write_acpi_tables(unsigned long start)
 	acpi_create_fadt(fadt, facs, dsdt);
 	acpi_add_table(rsdp, fadt);
 
-	printk_debug("ACPI:     * SSDT\n");
+	printk(BIOS_DEBUG, "ACPI:     * SSDT\n");
 	ssdt = (acpi_header_t *)current;
 	acpi_create_ssdt_generator(ssdt, "COREBOOT");
 	current += ssdt->length;
 	acpi_add_table(rsdp, ssdt);
 	ALIGN_CURRENT;
 
-	printk_debug("current = %lx\n", current);
+	printk(BIOS_DEBUG, "current = %lx\n", current);
 
-	printk_debug("ACPI:     * DMI (Linux workaround)\n");
+	printk(BIOS_DEBUG, "ACPI:     * DMI (Linux workaround)\n");
 	memcpy((void *)0xfff80, dmi_table, DMI_TABLE_SIZE);
 #if CONFIG_WRITE_HIGH_TABLES == 1
 	memcpy((void *)current, dmi_table, DMI_TABLE_SIZE);
@@ -361,10 +361,10 @@ unsigned long write_acpi_tables(unsigned long start)
 	ALIGN_CURRENT;
 #endif
 
-	printk_info("ACPI: done.\n");
+	printk(BIOS_INFO, "ACPI: done.\n");
 
 	/* Enable Dummy DCC ON# for DVI */
-	printk_debug("Laptop handling...\n");
+	printk(BIOS_DEBUG, "Laptop handling...\n");
 	outb(inb(0x60f) & ~(1 << 5), 0x60f);
 
 	return current;
diff --git a/src/mainboard/roda/rk886ex/ec.c b/src/mainboard/roda/rk886ex/ec.c
index 5121ac2e08..f2d23ad6c5 100644
--- a/src/mainboard/roda/rk886ex/ec.c
+++ b/src/mainboard/roda/rk886ex/ec.c
@@ -32,10 +32,10 @@ int send_ec_command(u8 command)
 	while ((inb(EC_SC) & EC_IBF) && --timeout) {
 		udelay(10);
 		if ((timeout & 0xff) == 0)
-			printk_spew(".");
+			printk(BIOS_SPEW, ".");
 	}
 	if (!timeout) {
-		printk_debug("Timeout while sending command 0x%02x to EC!\n", 
+		printk(BIOS_DEBUG, "Timeout while sending command 0x%02x to EC!\n", 
 				command);
 		// return -1;
 	}
@@ -52,10 +52,10 @@ int send_ec_data(u8 data)
 	while ((inb(EC_SC) & EC_IBF) && --timeout) { // wait for IBF = 0
 		udelay(10);
 		if ((timeout & 0xff) == 0)
-			printk_spew(".");
+			printk(BIOS_SPEW, ".");
 	}
 	if (!timeout) {
-		printk_debug("Timeout while sending data 0x%02x to EC!\n",
+		printk(BIOS_DEBUG, "Timeout while sending data 0x%02x to EC!\n",
 				data);
 		// return -1;
 	}
@@ -84,15 +84,15 @@ u8 recv_ec_data(void)
 		}
 		udelay(10);
 		if ((timeout & 0xff) == 0)
-			printk_spew(".");
+			printk(BIOS_SPEW, ".");
 	}
 	if (!timeout) {
-		printk_debug("\nTimeout while receiving data from EC!\n");
+		printk(BIOS_DEBUG, "\nTimeout while receiving data from EC!\n");
 		// return -1;
 	}
 
 	data = inb(EC_DATA);
-	printk_debug("recv_ec_data: 0x%02x\n", data);
+	printk(BIOS_DEBUG, "recv_ec_data: 0x%02x\n", data);
 
 	return data;
 }
diff --git a/src/mainboard/roda/rk886ex/m3885.c b/src/mainboard/roda/rk886ex/m3885.c
index 66e030da88..418f43f5de 100644
--- a/src/mainboard/roda/rk886ex/m3885.c
+++ b/src/mainboard/roda/rk886ex/m3885.c
@@ -118,10 +118,10 @@ static int send_kbd_command(u8 command)
 	while ((inb(KBD_SC) & KBD_IBF) && --timeout) {
 		udelay(10);
 		if ((timeout & 0xff) == 0)
-			printk_spew(".");
+			printk(BIOS_SPEW, ".");
 	}
 	if (!timeout) {
-		printk_debug("Timeout while sending command 0x%02x to EC!\n", 
+		printk(BIOS_DEBUG, "Timeout while sending command 0x%02x to EC!\n", 
 				command);
 		// return -1;
 	}
@@ -138,10 +138,10 @@ static int send_kbd_data(u8 data)
 	while ((inb(KBD_SC) & KBD_IBF) && --timeout) { // wait for IBF = 0
 		udelay(10);
 		if ((timeout & 0xff) == 0)
-			printk_spew(".");
+			printk(BIOS_SPEW, ".");
 	}
 	if (!timeout) {
-		printk_debug("Timeout while sending data 0x%02x to EC!\n",
+		printk(BIOS_DEBUG, "Timeout while sending data 0x%02x to EC!\n",
 				data);
 		// return -1;
 	}
@@ -164,10 +164,10 @@ static u8 recv_kbd_data(void)
 		}
 		udelay(10);
 		if ((timeout & 0xff) == 0)
-			printk_spew(".");
+			printk(BIOS_SPEW, ".");
 	}
 	if (!timeout) {
-		printk_debug("\nTimeout while receiving data from EC!\n");
+		printk(BIOS_DEBUG, "\nTimeout while receiving data from EC!\n");
 		// return -1;
 	}
 
@@ -186,13 +186,13 @@ static u8 m3885_get_variable(u8 index)
 	send_kbd_command(0xbc);
 	send_kbd_command(0xff);
 	ret = recv_kbd_data();
-	printk_spew("m3885: get variable %02x = %02x\n", index, ret);
+	printk(BIOS_SPEW, "m3885: get variable %02x = %02x\n", index, ret);
 	return ret;
 }
 
 static void m3885_set_variable(u8 index, u8 data)
 {
-	printk_spew("m3885: set variable %02x = %02x\n", index, data);
+	printk(BIOS_SPEW, "m3885: set variable %02x = %02x\n", index, data);
 	send_kbd_command(0xb8);
 	send_kbd_data(index);
 	send_kbd_command(0xbd);
@@ -201,7 +201,7 @@ static void m3885_set_variable(u8 index, u8 data)
 
 static void m3885_set_proc_ram(u8 index, u8 data)
 {
-	printk_spew("m3885: set procram %02x = %02x\n", index, data);
+	printk(BIOS_SPEW, "m3885: set procram %02x = %02x\n", index, data);
 	send_kbd_command(0xb8);
 	send_kbd_data(index);
 	send_kbd_command(0xbb);
@@ -217,7 +217,7 @@ static u8 m3885_get_proc_ram(u8 index)
 	send_kbd_command(0xba);
 	// send_kbd_command(0xff);
 	ret = recv_kbd_data();
-	printk_spew("m3885: get procram %02x = %02x\n", index, ret);
+	printk(BIOS_SPEW, "m3885: get procram %02x = %02x\n", index, ret);
 	return ret;
 }
 
@@ -255,25 +255,25 @@ void m3885_configure_multikey(void)
 
 	/* Get the number of variables */
 	maxvars = m3885_get_variable(0x00);
-	printk_debug("M388x has %d variables in bank 2.\n", maxvars);
+	printk(BIOS_DEBUG, "M388x has %d variables in bank 2.\n", maxvars);
 	if (maxvars >= 35) {
 		offs = m3885_get_variable(0x23);
 		if ((offs > 0xc0) || (offs < 0x80)) {
-			printk_debug("M388x does not have a valid ram offset (0x%x)\n", offs);
+			printk(BIOS_DEBUG, "M388x does not have a valid ram offset (0x%x)\n", offs);
 		} else {
-			printk_debug("Writing Fn-Table to M388x RAM offset 0x%x\n", offs);
+			printk(BIOS_DEBUG, "Writing Fn-Table to M388x RAM offset 0x%x\n", offs);
 			for (i=0; i < ARRAY_SIZE(function_ram); i++) {
 				m3885_set_proc_ram(i + offs, function_ram[i]);
 			}
 		}
 	} else {
-		printk_debug("Could not load Function-RAM (%d).\n", maxvars);
+		printk(BIOS_DEBUG, "Could not load Function-RAM (%d).\n", maxvars);
 	}
 
 	// restore original bank
 	m3885_set_variable(0x0c, kstate5_flags);
 	maxvars = m3885_get_variable(0x00);
-	printk_debug("M388x has %d variables in original bank.\n", maxvars);
+	printk(BIOS_DEBUG, "M388x has %d variables in original bank.\n", maxvars);
 	for (i=0; i<ARRAY_SIZE(variables); i+=3) {
 		u8 reg8;
 		if(variables[i + 0] > maxvars)
@@ -402,10 +402,10 @@ u8 m3885_gpio(u8 value)
 	timeout = 0xf;
 	while (ec_read(M3885_CMCMD) && --timeout) {
 		udelay(10);
-		printk_debug(".");
+		printk(BIOS_DEBUG, ".");
 	}
 	if (!timeout) {
-		printk_debug("\nTimeout while waiting for M3885 command!\n");
+		printk(BIOS_DEBUG, "\nTimeout while waiting for M3885 command!\n");
 	}
 
 	/* If it was a read function: Pin state */
diff --git a/src/mainboard/roda/rk886ex/mainboard.c b/src/mainboard/roda/rk886ex/mainboard.c
index a82553f126..1594241c23 100644
--- a/src/mainboard/roda/rk886ex/mainboard.c
+++ b/src/mainboard/roda/rk886ex/mainboard.c
@@ -48,7 +48,7 @@ static void backlight_enable(void)
 		m3885_gpio(M3885_GPIO_PULSE|M3885_GPIO_TOGGLE|M3885_GPIO_P56);
 	}
 #endif
-	printk_debug("Display I/O: 0x%02x\n", inb(0x60f));
+	printk(BIOS_DEBUG, "Display I/O: 0x%02x\n", inb(0x60f));
 }
 
 #if CONFIG_PCI_OPTION_ROM_RUN_YABEL
@@ -65,7 +65,7 @@ static int int15_handler(void)
 #define BOOT_DISPLAY_EFP2	(1 << 6)
 #define BOOT_DISPLAY_LCD2	(1 << 7)
 
-	printk_debug("%s: AX=%04x BX=%04x CX=%04x DX=%04x\n",
+	printk(BIOS_DEBUG, "%s: AX=%04x BX=%04x CX=%04x DX=%04x\n",
 			  __func__, M.x86.R_AX, M.x86.R_BX, M.x86.R_CX, M.x86.R_DX);
 
 	switch (M.x86.R_AX) {
@@ -103,13 +103,13 @@ static void dump_runtime_registers(void)
 {
 	int i;
 
-	printk_debug("SuperIO runtime register block:\n");
+	printk(BIOS_DEBUG, "SuperIO runtime register block:\n");
 	for (i=0; i<0x10; i++)
-		printk_debug("%02x ", i);
-	printk_debug("\n");
+		printk(BIOS_DEBUG, "%02x ", i);
+	printk(BIOS_DEBUG, "\n");
 	for (i=0; i<0x10; i++)
-		printk_debug("%02x ", inb(0x600 +i));
-	printk_debug("\n");
+		printk(BIOS_DEBUG, "%02x ", inb(0x600 +i));
+	printk(BIOS_DEBUG, "\n");
 }
 #endif
 
diff --git a/src/mainboard/roda/rk886ex/mainboard_smi.c b/src/mainboard/roda/rk886ex/mainboard_smi.c
index e0ba6b9d31..dc1a7a7d08 100644
--- a/src/mainboard/roda/rk886ex/mainboard_smi.c
+++ b/src/mainboard/roda/rk886ex/mainboard_smi.c
@@ -33,7 +33,7 @@ int mainboard_io_trap_handler(int smif)
 {
 	switch (smif) {
 	case 0x99:
-		printk_debug("Sample\n");
+		printk(BIOS_DEBUG, "Sample\n");
 		//gnvs->smif = 0;
 		break;
 	default:
diff --git a/src/mainboard/roda/rk886ex/mptable.c b/src/mainboard/roda/rk886ex/mptable.c
index 4764320f48..1186c3242b 100644
--- a/src/mainboard/roda/rk886ex/mptable.c
+++ b/src/mainboard/roda/rk886ex/mptable.c
@@ -118,7 +118,7 @@ void *smp_write_config_table(void *v)
 	mc->mpe_checksum = smp_compute_checksum(smp_next_mpc_entry(mc), mc->mpe_length);
 	mc->mpc_checksum = smp_compute_checksum(mc, mc->mpc_length);
 
-	printk_debug("Wrote the mp table end at: %p - %p\n", mc, smp_next_mpe_entry(mc));
+	printk(BIOS_DEBUG, "Wrote the mp table end at: %p - %p\n", mc, smp_next_mpe_entry(mc));
 
 	return smp_next_mpe_entry(mc);
 }
diff --git a/src/mainboard/roda/rk886ex/romstage.c b/src/mainboard/roda/rk886ex/romstage.c
index 1f4b856727..4052c3277a 100644
--- a/src/mainboard/roda/rk886ex/romstage.c
+++ b/src/mainboard/roda/rk886ex/romstage.c
@@ -58,7 +58,7 @@
 #include "southbridge/intel/i82801gx/i82801gx.h"
 static void setup_ich7_gpios(void)
 {
-	printk_debug(" GPIOS...");
+	printk(BIOS_DEBUG, " GPIOS...");
 	/* General Registers */
 	outl(0xbfc0f7c0, DEFAULT_GPIOBASE + 0x00);	/* GPIO_USE_SEL */
 	outl(0x70a87d83, DEFAULT_GPIOBASE + 0x04);	/* GP_IO_SEL */
@@ -304,7 +304,7 @@ void real_main(unsigned long bist)
 	report_bist_failure(bist);
 
 	if (MCHBAR16(SSKPD) == 0xCAFE) {
-		printk_debug("soft reset detected.\n");
+		printk(BIOS_DEBUG, "soft reset detected.\n");
 		boot_mode = 1;
 	}
 
@@ -318,10 +318,10 @@ void real_main(unsigned long bist)
 
 	/* Read PM1_CNT */
 	reg32 = inl(DEFAULT_PMBASE + 0x04);
-	printk_debug("PM1_CNT: %08x\n", reg32);
+	printk(BIOS_DEBUG, "PM1_CNT: %08x\n", reg32);
 	if (((reg32 >> 10) & 7) == 5) {
 #if CONFIG_HAVE_ACPI_RESUME
-		printk_debug("Resume from S3 detected.\n");
+		printk(BIOS_DEBUG, "Resume from S3 detected.\n");
 		boot_mode = 2;
 		/* Clear SLP_TYPE. This will break stage2 but
 		 * we care for that when we get there.
@@ -329,7 +329,7 @@ void real_main(unsigned long bist)
 		outl(reg32 & ~(7 << 10), DEFAULT_PMBASE + 0x04);
 
 #else
-		printk_debug("Resume from S3 detected, but disabled.\n");
+		printk(BIOS_DEBUG, "Resume from S3 detected, but disabled.\n");
 #endif
 	}
 
@@ -365,7 +365,7 @@ void real_main(unsigned long bist)
 		/* This will not work if TSEG is in place! */
 		u32 tom = pci_read_config32(PCI_DEV(0,2,0), 0x5c);
 
-		printk_debug("TOM: 0x%08x\n", tom);
+		printk(BIOS_DEBUG, "TOM: 0x%08x\n", tom);
 		ram_check(0x00000000, 0x000a0000);
 		ram_check(0x00100000, tom);
 	}
diff --git a/src/mainboard/roda/rk886ex/rtl8168.c b/src/mainboard/roda/rk886ex/rtl8168.c
index 18f41fe32a..e278bcfb4e 100644
--- a/src/mainboard/roda/rk886ex/rtl8168.c
+++ b/src/mainboard/roda/rk886ex/rtl8168.c
@@ -27,7 +27,7 @@
 
 static void nic_init(struct device *dev)
 {
-	printk_debug("Initializing RTL8168 Gigabit Ethernet\n");
+	printk(BIOS_DEBUG, "Initializing RTL8168 Gigabit Ethernet\n");
 	// Nothing to do yet, but this has to be here to keep 
 	// coreboot from trying to execute an option ROM.
 }