Get mptable OEM/product ID from kconfig variables.

[coreboot.git] / src / mainboard / via / epia-n / mptable.c

diff --git a/src/mainboard/via/epia-n/mptable.c b/src/mainboard/via/epia-n/mptable.c
index 1bcdcb211f7418f8c6ef0eba93572b31cff5bf1d..2102bf6f9a80820faba90f2dac7dae46913aeaf2 100644 (file)
--- a/src/mainboard/via/epia-n/mptable.c
+++ b/src/mainboard/via/epia-n/mptable.c
@@ -14,45 +14,14 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, "EPIA-N      ", LAPIC_ADDR);
+       mptable_init(mc, LAPIC_ADDR);
 
         smp_write_processors(mc);
         mptable_write_buses(mc, NULL, &isa_bus);
 
 /*I/O APICs:   APIC ID Version State           Address*/
        smp_write_ioapic(mc, 2, 0x20, IO_APIC_ADDR);
-       {
-               device_t dev;
-               struct resource *res;
-               dev = dev_find_slot(1, PCI_DEVFN(0x1e,0));
-               if (dev) {
-                       res = find_resource(dev, PCI_BASE_ADDRESS_0);
-                       if (res) {
-                               smp_write_ioapic(mc, 3, 0x20, res->base);
-                       }
-               }
-               dev = dev_find_slot(1, PCI_DEVFN(0x1c,0));
-               if (dev) {
-                       res = find_resource(dev, PCI_BASE_ADDRESS_0);
-                       if (res) {
-                               smp_write_ioapic(mc, 4, 0x20, res->base);
-                       }
-               }
-                dev = dev_find_slot(4, PCI_DEVFN(0x1e,0));
-                if (dev) {
-                       res = find_resource(dev, PCI_BASE_ADDRESS_0);
-                       if (res) {
-                               smp_write_ioapic(mc, 5, 0x20, res->base);
-                       }
-                }
-                dev = dev_find_slot(4, PCI_DEVFN(0x1c,0));
-                if (dev) {
-                       res = find_resource(dev, PCI_BASE_ADDRESS_0);
-                       if (res) {
-                               smp_write_ioapic(mc, 8, 0x20, res->base);
-                       }
-                }
-       }
+
        mptable_add_isa_interrupts(mc, isa_bus, 0x2, 0);
 
 /*I/O Ints:    Type    Polarity    Trigger     Bus ID   IRQ    APIC ID PIN# */
@@ -66,8 +35,8 @@ static void *smp_write_config_table(void *v)
        smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x0, 0x48, 0x2, 0x17);
        smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL|MP_IRQ_POLARITY_LOW, 0x0, 0x3d, 0x2, 0x14);
 /*Local Ints:  Type    Polarity    Trigger     Bus ID   IRQ    APIC ID PIN#*/
-       smp_write_intsrc(mc, mp_ExtINT, MP_IRQ_TRIGGER_DEFAULT|MP_IRQ_POLARITY_DEFAULT, 0x0, 0x0, MP_APIC_ALL, 0x0);
-       smp_write_intsrc(mc, mp_NMI, MP_IRQ_TRIGGER_DEFAULT|MP_IRQ_POLARITY_DEFAULT, 0x0, 0x0, MP_APIC_ALL, 0x1);
+       smp_write_lintsrc(mc, mp_ExtINT, MP_IRQ_TRIGGER_DEFAULT|MP_IRQ_POLARITY_DEFAULT, 0x0, 0x0, MP_APIC_ALL, 0x0);
+       smp_write_lintsrc(mc, mp_NMI, MP_IRQ_TRIGGER_DEFAULT|MP_IRQ_POLARITY_DEFAULT, 0x0, 0x0, MP_APIC_ALL, 0x1);
        /* There is no extension information... */
 
        /* Compute the checksums */