Remove old ACPI code

[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 00088f7b65f7e1504aed648d110242111c20c140..3742c2097b919ea8f5839ac0cc3d6b9eb2a9c13e 100644 (file)
--- a/src/mainboard/roda/rk886ex/acpi_tables.c
+++ b/src/mainboard/roda/rk886ex/acpi_tables.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <console/console.h>
 #include <arch/io.h>
+#include <arch/ioapic.h>
 #include <arch/acpi.h>
 #include <arch/acpigen.h>
 #include <arch/smp/mpspec.h>
@@ -35,62 +36,7 @@ extern const unsigned char AmlCode[];
 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/i82801gx_nvs.h"
+#include "southbridge/intel/i82801gx/nvs.h"
 static void acpi_create_gnvs(global_nvs_t *gnvs)
 {
        memset((void *)gnvs, 0, sizeof(*gnvs));
@@ -142,10 +88,6 @@ static void acpi_create_intel_hpet(acpi_hpet_t * hpet)
            acpi_checksum((void *) hpet, sizeof(acpi_hpet_t));
 }
 
-
-
-#define IO_APIC_ADDR   0xfec00000UL
-
 unsigned long acpi_fill_madt(unsigned long current)
 {
        /* Local APICs */