printk_foo -> printk(BIOS_FOO, ...)

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

diff --git a/src/mainboard/amd/dbm690t/acpi_tables.c b/src/mainboard/amd/dbm690t/acpi_tables.c
index f3092fdb8289af8d48b7e3ed605f4d605ecc3e89..b77a3bd5078f411e4e93730fc19bcd29ac8b1eb3 100644 (file)
--- a/src/mainboard/amd/dbm690t/acpi_tables.c
+++ b/src/mainboard/amd/dbm690t/acpi_tables.c
@@ -49,9 +49,9 @@ static void dump_mem(u32 start, u32 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", (u8)*((u8 *)i));
+               printk(BIOS_DEBUG, " %02x", (u8)*((u8 *)i));
        }
        print_debug("\n");
 }
@@ -59,7 +59,7 @@ static void dump_mem(u32 start, u32 end)
 
 extern u8 AmlCode[];
 
-#if ACPI_SSDTX_NUM >= 1
+#if CONFIG_ACPI_SSDTX_NUM >= 1
 extern u8 AmlCode_ssdt2[];
 extern u8 AmlCode_ssdt3[];
 extern u8 AmlCode_ssdt4[];
@@ -101,7 +101,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;
@@ -123,7 +123,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();
        amd_model_fxx_generate_powernow(pm_base + 8, 6, 1);
        return (unsigned long) (acpigen_get_current());
@@ -147,7 +147,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;
@@ -158,50 +158,50 @@ unsigned long write_acpi_tables(unsigned long start)
        /* clear all table memory */
        memset((void *)start, 0, current - start);
 
-       acpi_write_rsdp(rsdp, rsdt);
+       acpi_write_rsdp(rsdp, rsdt, NULL);
        acpi_write_rsdt(rsdt);
 
        /*
         * We explicitly add these tables later on:
         */
        /* If we want to use HPET Timers Linux wants an MADT */
-       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(rsdt, hpet);
+       acpi_add_table(rsdp, hpet);
 
-       printk_debug("ACPI:    * MADT\n");
+       printk(BIOS_DEBUG, "ACPI:    * MADT\n");
        madt = (acpi_madt_t *) current;
        acpi_create_madt(madt);
        current += madt->header.length;
-       acpi_add_table(rsdt, madt);
+       acpi_add_table(rsdp, madt);
 
 #if 0
        /* 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(rsdt, srat);
+       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(rsdt, slit);
+       acpi_add_table(rsdp, slit);
 #endif
 
        /* SSDT */
-       printk_debug("ACPI:    * SSDT\n");
+       printk(BIOS_DEBUG, "ACPI:    * SSDT\n");
        ssdt = (acpi_header_t *)current;
 
        acpi_create_ssdt_generator(ssdt, "DYNADATA");
        current += ssdt->length;
-       acpi_add_table(rsdt, ssdt);
+       acpi_add_table(rsdp, ssdt);
 
-#if ACPI_SSDTX_NUM >= 1
+#if CONFIG_ACPI_SSDTX_NUM >= 1
 
        /* same htio, but different position? We may have to copy, change HCIN, and recalculate the checknum and add_table */
 
@@ -214,7 +214,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]) {
@@ -238,54 +238,54 @@ unsigned long write_acpi_tables(unsigned long start)
                ssdtx->checksum = 0;
                ssdtx->checksum =
                    acpi_checksum((u8 *)ssdtx, ssdtx->length);
-               acpi_add_table(rsdt, ssdtx);
+               acpi_add_table(rsdp, ssdtx);
        }
 #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;
        memcpy((void *)dsdt, (void *)AmlCode,
               ((acpi_header_t *) AmlCode)->length);
        current += dsdt->length;
-       printk_debug("ACPI:    * DSDT @ %08x Length %x\n", dsdt, dsdt->length);
+       printk(BIOS_DEBUG, "ACPI:    * DSDT @ %p Length %x\n", dsdt, dsdt->length);
        /* FADT */
-       printk_debug("ACPI:    * FADT\n");
+       printk(BIOS_DEBUG, "ACPI:    * FADT\n");
        fadt = (acpi_fadt_t *) current;
        current += sizeof(acpi_fadt_t);
 
        acpi_create_fadt(fadt, facs, dsdt);
-       acpi_add_table(rsdt, fadt);
+       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;
 }