Use default table creator macro for all SSDTs

[coreboot.git] / src / mainboard / roda / rk886ex / acpi_tables.c

diff --git a/src/mainboard/roda/rk886ex/acpi_tables.c b/src/mainboard/roda/rk886ex/acpi_tables.c
index d9275b5ac0763dfe7caf648594ac778ce8da0c68..412ec47ed090f83ddaf78d2841829d54ccf36ebb 100644 (file)
--- a/src/mainboard/roda/rk886ex/acpi_tables.c
+++ b/src/mainboard/roda/rk886ex/acpi_tables.c
@@ -29,68 +29,12 @@
 #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
 unsigned long acpi_create_slic(unsigned long current);
 #endif
 
-#define OLD_ACPI 0
-#if OLD_ACPI
-static void acpi_create_gnvs(global_nvs_t *gnvs)
-{
-       memset (gnvs, 0, sizeof(global_nvs_t));
-
-       gnvs->LIDS = 1;
-       gnvs->PWRS = 1;
-
-       gnvs->ACTT = 0x37;
-       gnvs->PSVT = 0x4f;
-
-       gnvs->TC1V = 0x00;
-       gnvs->TC2V = 0x0a;
-       gnvs->TSPV = 0x02;
-
-       gnvs->CRTT = 0x77;
-
-       gnvs->B0SC = 0x54;
-       gnvs->APIC = 0x01;
-       gnvs->MPEN = 0x01;
-
-       gnvs->PPCM = 0x02;
-       gnvs->PCP0 = 0xbf;
-       gnvs->PCP1 = 0xbf;
-
-       gnvs->CMAP = 0x01;
-       gnvs->CMBP = 0x01;
-       gnvs->LT0  = 0x01;
-       gnvs->FDCP = 0x01;
-       gnvs->CMCP = 0x01;
-       gnvs->CMDP = 0x01;
-       gnvs->P2M  = 0x02;
-
-       gnvs->IGDS = 0x01;
-
-       gnvs->CADL = 0x09;
-       gnvs->PADL = 0x09;
-
-       gnvs->NDID = 3;
-       gnvs->DID1 = 0x80000100;
-       gnvs->DID2 = 0x80000240;
-       gnvs->DID3 = 0x80000410;
-       gnvs->DID4 = 0x80000410;
-       gnvs->DID5 = 0x00000005;
-
-       gnvs->ALAF = 0x64;
-       gnvs->LLOW = 0x2c;
-       gnvs->LHIH = 0x01;
-
-        // tolud = pci_read_config32(dev_find_slot(0, PCI_DEVFN(2, 0)), 0x5c);
-       // oemb->topm = tolud;
-}
-#endif
-
 #include "southbridge/intel/i82801gx/nvs.h"
 static void acpi_create_gnvs(global_nvs_t *gnvs)
 {
@@ -122,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);
@@ -343,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 */