Use default table creator macro for all SSDTs

[coreboot.git] / src / mainboard / lenovo / x60 / acpi_tables.c

diff --git a/src/mainboard/lenovo/x60/acpi_tables.c b/src/mainboard/lenovo/x60/acpi_tables.c
index 3742c2097b919ea8f5839ac0cc3d6b9eb2a9c13e..412ec47ed090f83ddaf78d2841829d54ccf36ebb 100644 (file)
--- a/src/mainboard/lenovo/x60/acpi_tables.c
+++ b/src/mainboard/lenovo/x60/acpi_tables.c
@@ -29,7 +29,6 @@
 #include <device/device.h>
 #include <device/pci.h>
 #include <device/pci_ids.h>
-#include "dmi.h"
 
 extern const unsigned char AmlCode[];
 #if CONFIG_HAVE_ACPI_SLIC
@@ -67,7 +66,7 @@ static void acpi_create_intel_hpet(acpi_hpet_t * hpet)
        /* fill out header fields */
        memcpy(header->signature, "HPET", 4);
        memcpy(header->oem_id, OEM_ID, 6);
-       memcpy(header->oem_table_id, "COREBOOT", 8);
+       memcpy(header->oem_table_id, ACPI_TABLE_CREATOR, 8);
        memcpy(header->asl_compiler_id, ASLC, 4);
 
        header->length = sizeof(acpi_hpet_t);
@@ -288,21 +287,12 @@ unsigned long write_acpi_tables(unsigned long start)
 
        printk(BIOS_DEBUG, "ACPI:     * SSDT\n");
        ssdt = (acpi_header_t *)current;
-       acpi_create_ssdt_generator(ssdt, "COREBOOT");
+       acpi_create_ssdt_generator(ssdt, ACPI_TABLE_CREATOR);
        current += ssdt->length;
        acpi_add_table(rsdp, ssdt);
        ALIGN_CURRENT;
 
        printk(BIOS_DEBUG, "current = %lx\n", current);
-
-       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);
-       current += DMI_TABLE_SIZE;
-       ALIGN_CURRENT;
-#endif
-
        printk(BIOS_INFO, "ACPI: done.\n");
 
        /* Enable Dummy DCC ON# for DVI */