printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / mainboard / broadcom / blast / irq_tables.c

diff --git a/src/mainboard/broadcom/blast/irq_tables.c b/src/mainboard/broadcom/blast/irq_tables.c
index 6695a900aa27bf14c360912abaaabcaec5f836f6..0bc556c967fb76bd5b9416035c1942f3218108be 100644 (file)
--- a/src/mainboard/broadcom/blast/irq_tables.c
+++ b/src/mainboard/broadcom/blast/irq_tables.c
@@ -10,9 +10,7 @@
 #include <stdint.h>
 #include <arch/pirq_routing.h>
 
-extern unsigned pci1234[];
-extern  unsigned sbdn;
-extern  unsigned hcdn[];
+#include <cpu/amd/amdk8_sysconf.h>
 
 static void write_pirq_info(struct irq_info *pirq_info, uint8_t bus, uint8_t devfn, uint8_t link0, uint16_t bitmap0,
                 uint8_t link1, uint16_t bitmap1, uint8_t link2, uint16_t bitmap2,uint8_t link3, uint16_t bitmap3,
@@ -62,7 +60,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...", addr);
+        printk(BIOS_INFO, "Writing IRQ routing tables to 0x%x...", addr);
 
        pirq = (void *)(addr);
        v = (uint8_t *)(addr);
@@ -71,7 +69,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
        pirq->version  = PIRQ_VERSION;
        
        pirq->rtr_bus = bus_bcm5785_0;
-       pirq->rtr_devfn = (sbdn<<3)|0;
+       pirq->rtr_devfn = (sysconf.sbdn<<3)|0;
 
        pirq->exclusive_irqs = 0;
        
@@ -87,7 +85,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
        pirq_info = (void *) ( &pirq->checksum + 1);
        slot_num = 0;
 //pci bridge
-       write_pirq_info(pirq_info, bus_bcm5785_0, (sbdn<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0);
+       write_pirq_info(pirq_info, bus_bcm5785_0, (sysconf.sbdn<<3)|0, 0x1, 0xdef8, 0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0);
        pirq_info++; slot_num++;
              
        pirq->size = 32 + 16 * slot_num; 
@@ -101,7 +99,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;