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

2 files changed, 25 insertions, 25 deletions

diff --git a/src/mainboard/tyan/s2882/irq_tables.c b/src/mainboard/tyan/s2882/irq_tables.c
index e10f7632e647..b5c075e87934 100644
--- a/src/mainboard/tyan/s2882/irq_tables.c
+++ b/src/mainboard/tyan/s2882/irq_tables.c
@@ -64,7 +64,7 @@ static unsigned node_link_to_bus(unsigned node, unsigned link)
                 dst_link = (config_map >> 8) & 3;
                 bus_base = (config_map >> 16) & 0xff;
 #if 0                           
-                printk_debug("node.link=bus: %d.%d=%d 0x%2x->0x%08x\n",
+                printk(BIOS_DEBUG, "node.link=bus: %d.%d=%d 0x%2x->0x%08x\n",
                         dst_node, dst_link, bus_base,
                         reg, config_map);
 #endif
@@ -115,7 +115,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
                 /* HT chain 0 */
                 bus_chain_0 = node_link_to_bus(0, 0);
                 if (bus_chain_0 == 0) {
-                        printk_debug("ERROR - cound not find bus for node 0 chain 0, using defaults\n");
+                        printk(BIOS_DEBUG, "ERROR - cound not find bus for node 0 chain 0, using defaults\n");
                         bus_chain_0 = 1;
                 }
 
@@ -125,7 +125,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
                         bus_8111_1 = pci_read_config8(dev, PCI_SECONDARY_BUS);
                 }
                 else {
-                        printk_debug("ERROR - could not find PCI 1:03.0, using defaults\n");
+                        printk(BIOS_DEBUG, "ERROR - could not find PCI 1:03.0, using defaults\n");
 
                         bus_8111_1 = 4;
                 }
@@ -136,7 +136,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 
                 }
                 else {
-                        printk_debug("ERROR - could not find PCI 1:01.0, using defaults\n");
+                        printk(BIOS_DEBUG, "ERROR - could not find PCI 1:01.0, using defaults\n");
 
                         bus_8131_1 = 2;
                 }
@@ -147,7 +147,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 
                 }
                 else {
-                        printk_debug("ERROR - could not find PCI 1:02.0, using defaults\n");
+                        printk(BIOS_DEBUG, "ERROR - could not find PCI 1:02.0, using defaults\n");
 
                         bus_8131_2 = 3;
                 }
@@ -158,7 +158,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
         addr &= ~15;
 
         /* This table must be betweeen 0xf0000 & 0x100000 */
-        printk_info("Writing IRQ routing tables to 0x%x...\n", addr);
+        printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...\n", addr);
 
 	pirq = (void *)(addr);
 	v = (uint8_t *)(addr);
@@ -197,67 +197,67 @@ unsigned long write_pirq_routing_table(unsigned long addr)
                 }
         }
 
-        printk_debug("setting Onboard AMD Southbridge \n");
+        printk(BIOS_DEBUG, "setting Onboard AMD Southbridge \n");
         static const unsigned char slotIrqs_1_4[4] = { 5, 9, 11, 10 };
         pci_assign_irqs(bus_chain_0, 4, slotIrqs_1_4);
         write_pirq_info(pirq_info, bus_chain_0,(4<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0);
 	pirq_info++; slot_num++;
 	
-        printk_debug("setting Onboard AMD USB \n");
+        printk(BIOS_DEBUG, "setting Onboard AMD USB \n");
         static const unsigned char slotIrqs_8111_1_0[4] = { 0, 0, 0, 10 };
         pci_assign_irqs(bus_8111_1, 0, slotIrqs_8111_1_0);
         write_pirq_info(pirq_info, bus_8111_1,0, 0, 0, 0, 0, 0, 0, 0x4, 0xdef8, 0, 0);
 	pirq_info++; slot_num++;
 
-        printk_debug("setting Onboard ATI Display Adapter\n");
+        printk(BIOS_DEBUG, "setting Onboard ATI Display Adapter\n");
         static const unsigned char slotIrqs_8111_1_6[4] = { 11, 0, 0, 0 };
         pci_assign_irqs(bus_8111_1, 6, slotIrqs_8111_1_6);
         write_pirq_info(pirq_info, bus_8111_1,(6<<3)|0, 0x3, 0xdef8, 0, 0, 0, 0, 0, 0, 0, 0);
 	pirq_info++; slot_num++;
 
-        printk_debug("setting Slot 1\n");
+        printk(BIOS_DEBUG, "setting Slot 1\n");
         static const unsigned char slotIrqs_8131_2_3[4] = { 5, 9, 11, 10 };
         pci_assign_irqs(bus_8131_2, 3, slotIrqs_8131_2_3);
         write_pirq_info(pirq_info, bus_8131_2,(3<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0x1, 0);
 	pirq_info++; slot_num++;
 
-        printk_debug("setting Slot 2\n");
+        printk(BIOS_DEBUG, "setting Slot 2\n");
         static const unsigned char slotIrqs_8131_2_1[4] = { 9, 11, 10, 5 };
         pci_assign_irqs(bus_8131_2, 1, slotIrqs_8131_2_1);
         write_pirq_info(pirq_info, bus_8131_2,(1<<3)|0, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0x1, 0xdef8, 0x2, 0);
 	pirq_info++; slot_num++;
 
-        printk_debug("setting Slot 3\n");
+        printk(BIOS_DEBUG, "setting Slot 3\n");
         static const unsigned char slotIrqs_8131_1_3[4] = { 10, 5, 9, 11 };
         pci_assign_irqs(bus_8131_1, 3, slotIrqs_8131_1_3);
         write_pirq_info(pirq_info, bus_8131_1,(3<<3)|0, 0x4, 0xdef8, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x3, 0);
 	pirq_info++; slot_num++;
 
-        printk_debug("setting Slot 4\n");
+        printk(BIOS_DEBUG, "setting Slot 4\n");
         static const unsigned char slotIrqs_8131_1_2[4] = { 11, 10, 5, 9 };
         pci_assign_irqs(bus_8131_1, 2, slotIrqs_8131_1_2);
         write_pirq_info(pirq_info, bus_8131_1,(2<<3)|0, 0x3, 0xdef8, 0x4, 0xdef8, 0x1, 0xdef8, 0x2, 0xdef8, 0x4, 0);
 	pirq_info++; slot_num++;
 
-        printk_debug("setting Slot 5 \n");
+        printk(BIOS_DEBUG, "setting Slot 5 \n");
         static const unsigned char slotIrqs_8111_1_4[4] = { 5, 9, 11, 10 };
         pci_assign_irqs(bus_8111_1, 4, slotIrqs_8111_1_4);
         write_pirq_info(pirq_info, bus_8111_1,(4<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0x5, 0);
 	pirq_info++; slot_num++;
 
-        printk_debug("setting Onboard SI Serial ATA\n");
+        printk(BIOS_DEBUG, "setting Onboard SI Serial ATA\n");
         static const unsigned char slotIrqs_8111_1_5[4] = { 10, 0, 0, 0 };
         pci_assign_irqs(bus_8111_1, 5, slotIrqs_8111_1_5);
         write_pirq_info(pirq_info, bus_8111_1,(5<<3)|0, 0x4, 0xdef8, 0, 0, 0, 0, 0, 0, 0, 0);
 	pirq_info++; slot_num++;
 
-        printk_debug("setting Onboard Intel NIC\n");
+        printk(BIOS_DEBUG, "setting Onboard Intel NIC\n");
         static const unsigned char slotIrqs_8111_1_8[4] = { 11, 0, 0, 0 };
         pci_assign_irqs(bus_8111_1, 8, slotIrqs_8111_1_8);
         write_pirq_info(pirq_info, bus_8111_1,(8<<3)|0, 0x3, 0xdef8, 0, 0, 0, 0, 0, 0, 0, 0);
 	pirq_info++; slot_num++;
 
-        printk_debug("setting Onboard Adaptec  SCSI\n");
+        printk(BIOS_DEBUG, "setting Onboard Adaptec  SCSI\n");
         static const unsigned char slotIrqs_8131_1_6[4] = { 5, 9, 0, 0 };
         pci_assign_irqs(bus_8131_1, 6, slotIrqs_8131_1_6);
         write_pirq_info(pirq_info, bus_8131_1,(6<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0, 0, 0, 0, 0, 0);
@@ -268,7 +268,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	pirq_info++; slot_num++;
 #endif
 
-        printk_debug("setting Onboard Broadcom NIC\n");
+        printk(BIOS_DEBUG, "setting Onboard Broadcom NIC\n");
         static const unsigned char slotIrqs_8131_1_9[4] = { 5, 9, 0, 0 };
         pci_assign_irqs(bus_8131_1, 9, slotIrqs_8131_1_9);
         write_pirq_info(pirq_info, bus_8131_1,(9<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0, 0, 0, 0, 0, 0);
@@ -296,7 +296,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
                 pirq->checksum = sum;
         }
 
-	printk_info("done.\n");
+	printk(BIOS_INFO, "done.\n");
 
 	return	(unsigned long) pirq_info;
 
diff --git a/src/mainboard/tyan/s2882/mptable.c b/src/mainboard/tyan/s2882/mptable.c
index 6461a0be45e7..f546693ffb5e 100644
--- a/src/mainboard/tyan/s2882/mptable.c
+++ b/src/mainboard/tyan/s2882/mptable.c
@@ -31,7 +31,7 @@ static unsigned node_link_to_bus(unsigned node, unsigned link)
                 dst_link = (config_map >> 8) & 3;
                 bus_base = (config_map >> 16) & 0xff;
 #if 0                           
-                printk_debug("node.link=bus: %d.%d=%d 0x%2x->0x%08x\n",
+                printk(BIOS_DEBUG, "node.link=bus: %d.%d=%d 0x%2x->0x%08x\n",
                         dst_node, dst_link, bus_base,
                         reg, config_map);
 #endif
@@ -85,7 +85,7 @@ void *smp_write_config_table(void *v)
                 /* HT chain 0 */
                 bus_chain_0 = node_link_to_bus(0, 0);
                 if (bus_chain_0 == 0) {
-                        printk_debug("ERROR - cound not find bus for node 0 chain 0, using defaults\n");
+                        printk(BIOS_DEBUG, "ERROR - cound not find bus for node 0 chain 0, using defaults\n");
                         bus_chain_0 = 1;
                 }
 
@@ -97,7 +97,7 @@ void *smp_write_config_table(void *v)
                         bus_isa++;
                 }     
                 else {  
-                        printk_debug("ERROR - could not find PCI 1:03.0, using defaults\n");
+                        printk(BIOS_DEBUG, "ERROR - could not find PCI 1:03.0, using defaults\n");
 
                         bus_8111_1 = 4;
                         bus_isa = 5;
@@ -109,7 +109,7 @@ void *smp_write_config_table(void *v)
 
                 }
                 else {
-                        printk_debug("ERROR - could not find PCI 1:01.0, using defaults\n");
+                        printk(BIOS_DEBUG, "ERROR - could not find PCI 1:01.0, using defaults\n");
 
                         bus_8131_1 = 2;
                 }
@@ -120,7 +120,7 @@ void *smp_write_config_table(void *v)
 
                 }
                 else {
-                        printk_debug("ERROR - could not find PCI 1:02.0, using defaults\n");
+                        printk(BIOS_DEBUG, "ERROR - could not find PCI 1:02.0, using defaults\n");
 
                         bus_8131_2 = 3;
                 }
@@ -248,7 +248,7 @@ void *smp_write_config_table(void *v)
 	/* Compute the checksums */
 	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",
+	printk(BIOS_DEBUG, "Wrote the mp table end at: %p - %p\n",
 		mc, smp_next_mpe_entry(mc));
 	return smp_next_mpe_entry(mc);
 }