printk_foo -> printk(BIOS_FOO, ...)

[coreboot.git] / src / mainboard / amd / serengeti_cheetah / acpi_tables.c

diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
index 6bde4d5f43bed21d7cf7d13103c9800ae98ec389..15db99bed655d98ae0edb044e66f5b3c92e418a1 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
+++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c
@@ -30,9 +30,9 @@ static void dump_mem(unsigned start, unsigned end)
         print_debug("dump_mem:");
         for(i=start;i<end;i++) {
                 if((i & 0xf)==0) {
-                        printk_debug("\n%08x:", i);
+                        printk(BIOS_DEBUG, "\n%08x:", i);
                 }
-                printk_debug(" %02x", (unsigned char)*((unsigned char *)i));
+                printk(BIOS_DEBUG, " %02x", (unsigned char)*((unsigned char *)i));
         }
         print_debug("\n");
  }
@@ -156,7 +156,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 
 extern void get_bus_conf(void);
 
-void update_ssdtx(void *ssdtx, int i)
+static void update_ssdtx(void *ssdtx, int i)
 {
         uint8_t *PCI;
         uint8_t *HCIN;
@@ -179,7 +179,7 @@ void update_ssdtx(void *ssdtx, int i)
 
 }
 
-unsigned long acpi_fill_ssdt_generator(unsigned long current, char *oem_table_id) {
+unsigned long acpi_fill_ssdt_generator(unsigned long current, const char *oem_table_id) {
        k8acpi_write_vars();
        return (unsigned long) (acpigen_get_current());
 }
@@ -200,8 +200,6 @@ unsigned long write_acpi_tables(unsigned long start)
        acpi_header_t *ssdtx;
        unsigned char *p;
 
-       unsigned char *AmlCode_ssdtx[HC_POSSIBLE_NUM];
-
        int i;
 
        get_bus_conf(); //it will get sblk, pci1234, hcdn, and sbdn
@@ -210,7 +208,7 @@ unsigned long write_acpi_tables(unsigned long start)
        start   = ( start + 0x0f ) & -0x10;
        current = start;
        
-       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;
@@ -227,14 +225,14 @@ 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);
        acpi_create_hpet(hpet);
        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);
        current+=madt->header.length;
@@ -242,21 +240,21 @@ unsigned long write_acpi_tables(unsigned long start)
 
 
        /* SRAT */
-        printk_debug("ACPI:    * SRAT\n");
+        printk(BIOS_DEBUG, "ACPI:    * SRAT\n");
         srat = (acpi_srat_t *) current;
         acpi_create_srat(srat);
         current+=srat->header.length;
         acpi_add_table(rsdp,srat);
 
        /* SLIT */
-        printk_debug("ACPI:    * SLIT\n");
+        printk(BIOS_DEBUG, "ACPI:    * SLIT\n");
         slit = (acpi_slit_t *) current;
         acpi_create_slit(slit);
         current+=slit->header.length;
         acpi_add_table(rsdp,slit);
 
        /* SSDT */
-       printk_debug("ACPI:    * SSDT\n");
+       printk(BIOS_DEBUG, "ACPI:    * SSDT\n");
        ssdt = (acpi_header_t *)current;
 
        acpi_create_ssdt_generator(ssdt, "DYNADATA");
@@ -276,7 +274,7 @@ unsigned long write_acpi_tables(unsigned long start)
                 else {
                         c  = (uint8_t) ('A' + i - 1 - 6);
                 }
-                printk_debug("ACPI:    * SSDT for PCI%c Aka hcid = %d\n", c, sysconf.hcid[i]); //pci0 and pci1 are in dsdt
+                printk(BIOS_DEBUG, "ACPI:    * SSDT for PCI%c Aka hcid = %d\n", c, sysconf.hcid[i]); //pci0 and pci1 are in dsdt
                 current   = ( current + 0x07) & -0x08;
                 ssdtx = (acpi_header_t *)current;
                 switch(sysconf.hcid[i]) {
@@ -302,21 +300,21 @@ unsigned long write_acpi_tables(unsigned long start)
 #endif
 
        /* FACS */
-       printk_debug("ACPI:    * FACS\n");
+       printk(BIOS_DEBUG, "ACPI:    * FACS\n");
        facs = (acpi_facs_t *) current;
        current += sizeof(acpi_facs_t);
        acpi_create_facs(facs);
 
        /* DSDT */
-       printk_debug("ACPI:    * DSDT\n");
+       printk(BIOS_DEBUG, "ACPI:    * DSDT\n");
        dsdt = (acpi_header_t *)current;
        current += ((acpi_header_t *)AmlCode)->length;
        memcpy((void *)dsdt,(void *)AmlCode, \
                        ((acpi_header_t *)AmlCode)->length);
-       printk_debug("ACPI:    * DSDT @ %08x Length %x\n",dsdt,dsdt->length);
+       printk(BIOS_DEBUG, "ACPI:    * DSDT @ %p Length %x\n",dsdt,dsdt->length);
 
        /* FDAT */
-       printk_debug("ACPI:    * FADT\n");
+       printk(BIOS_DEBUG, "ACPI:    * FADT\n");
        fadt = (acpi_fadt_t *) current;
        current += sizeof(acpi_fadt_t);
 
@@ -324,29 +322,29 @@ unsigned long write_acpi_tables(unsigned long start)
        acpi_add_table(rsdp,fadt);
 
 #if DUMP_ACPI_TABLES == 1
-       printk_debug("rsdp\n");
+       printk(BIOS_DEBUG, "rsdp\n");
        dump_mem(rsdp, ((void *)rsdp) + sizeof(acpi_rsdp_t));
 
-        printk_debug("rsdt\n");
+        printk(BIOS_DEBUG, "rsdt\n");
         dump_mem(rsdt, ((void *)rsdt) + sizeof(acpi_rsdt_t));
 
-        printk_debug("madt\n");
+        printk(BIOS_DEBUG, "madt\n");
         dump_mem(madt, ((void *)madt) + madt->header.length);
 
-        printk_debug("srat\n");
+        printk(BIOS_DEBUG, "srat\n");
         dump_mem(srat, ((void *)srat) + srat->header.length);
 
-        printk_debug("slit\n");
+        printk(BIOS_DEBUG, "slit\n");
         dump_mem(slit, ((void *)slit) + slit->header.length);
 
-        printk_debug("ssdt\n");
+        printk(BIOS_DEBUG, "ssdt\n");
         dump_mem(ssdt, ((void *)ssdt) + ssdt->length);
 
-        printk_debug("fadt\n");
+        printk(BIOS_DEBUG, "fadt\n");
         dump_mem(fadt, ((void *)fadt) + fadt->header.length);
 #endif
 
-       printk_info("ACPI: done.\n");
+       printk(BIOS_INFO, "ACPI: done.\n");
        return current;
 }