Get mptable OEM/product ID from kconfig variables.

[coreboot.git] / src / mainboard / asus / a8n_e / mptable.c

diff --git a/src/mainboard/asus/a8n_e/mptable.c b/src/mainboard/asus/a8n_e/mptable.c
index 3a0806b8743dda02ee62f614e50c2933d6af1e00..05f74da0909434ac1582e3c049adf988acb569f3 100644 (file)
--- a/src/mainboard/asus/a8n_e/mptable.c
+++ b/src/mainboard/asus/a8n_e/mptable.c
@@ -28,50 +28,25 @@
 #include <stdint.h>
 #include <cpu/amd/amdk8_sysconf.h>
 
-extern unsigned char bus_isa;
 extern unsigned char bus_ck804[6];
 extern unsigned apicid_ck804;
-extern unsigned bus_type[256];
-
 
 static void *smp_write_config_table(void *v)
 {
-       static const char sig[4] = "PCMP";
-       static const char oem[8] = "ASUS    ";
-       static const char productid[12] = "A8N-E      ";
        struct mp_config_table *mc;
        unsigned sbdn;
-       int bus_num;
+       int bus_isa;
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
-       memset(mc, 0, sizeof(*mc));
-
-       memcpy(mc->mpc_signature, sig, sizeof(sig));
-       mc->mpc_length = sizeof(*mc);   /* initially just the header */
-       mc->mpc_spec = 0x04;
-       mc->mpc_checksum = 0;   /* not yet computed */
-       memcpy(mc->mpc_oem, oem, sizeof(oem));
-       memcpy(mc->mpc_productid, productid, sizeof(productid));
-       mc->mpc_oemptr = 0;
-       mc->mpc_oemsize = 0;
-       mc->mpc_entry_count = 0;        /* No entries yet... */
-       mc->mpc_lapic = LAPIC_ADDR;
-       mc->mpe_length = 0;
-       mc->mpe_checksum = 0;
-       mc->reserved = 0;
+
+       mptable_init(mc, LAPIC_ADDR);
 
        smp_write_processors(mc);
 
        get_bus_conf();
        sbdn = sysconf.sbdn;
 
-       /* Bus: Bus ID  Type */
-       /* Define numbers for PCI and ISA bus. */
-       for (bus_num = 0; bus_num < 256; bus_num++) {
-               if (bus_type[bus_num])
-                       smp_write_bus(mc, bus_num, "PCI   ");
-       }
-       smp_write_bus(mc, bus_isa, "ISA   ");
+       mptable_write_buses(mc, NULL, &bus_isa);
 
        /* I/O APICs:   APIC ID Version State           Address */
        {
@@ -100,45 +75,7 @@ static void *smp_write_config_table(void *v)
                }
        }
 
-       /* I/O Ints: Type Polarity    Trigger   Bus ID   IRQ    APIC ID PIN# */
-       smp_write_intsrc(mc, mp_ExtINT,
-                        MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
-                        bus_isa, 0x0, apicid_ck804, 0x0);
-       smp_write_intsrc(mc, mp_INT,
-                        MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
-                        bus_isa, 0x1, apicid_ck804, 0x1);
-       smp_write_intsrc(mc, mp_INT,
-                        MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
-                        bus_isa, 0x0, apicid_ck804, 0x2);
-       smp_write_intsrc(mc, mp_INT,
-                        MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
-                        bus_isa, 0x4, apicid_ck804, 0x4);
-       smp_write_intsrc(mc, mp_INT,
-                        MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
-                        bus_isa, 0x6, apicid_ck804, 0x6);
-       smp_write_intsrc(mc, mp_INT,
-                        MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
-                        bus_isa, 0x7, apicid_ck804, 0x7);
-       smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_EDGE | MP_IRQ_POLARITY_HIGH,
-                        bus_isa, 0x8, apicid_ck804, 0x8);
-       smp_write_intsrc(mc, mp_INT,
-                        MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
-                        bus_isa, 0x9, apicid_ck804, 0x9);
-       smp_write_intsrc(mc, mp_INT,
-                        MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
-                        bus_isa, 0xa, apicid_ck804, 0xa);
-       smp_write_intsrc(mc, mp_INT,
-                        MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
-                        bus_isa, 0xc, apicid_ck804, 0xc);
-       smp_write_intsrc(mc, mp_INT,
-                        MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
-                        bus_isa, 0xd, apicid_ck804, 0xd);
-       smp_write_intsrc(mc, mp_INT,
-                        MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
-                        bus_isa, 0xe, apicid_ck804, 0xe);
-       smp_write_intsrc(mc, mp_INT,
-                        MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
-                        bus_isa, 0xf, apicid_ck804, 0xf);
+       mptable_add_isa_interrupts(mc, bus_isa, apicid_ck804, 0);
 
        // Onboard ck804 smbus
        smp_write_intsrc(mc, mp_INT, MP_IRQ_TRIGGER_LEVEL | MP_IRQ_POLARITY_LOW,
@@ -171,10 +108,10 @@ static void *smp_write_config_table(void *v)
                         0x17);
 
        /* Local Ints: Type Polarity    Trigger Bus ID   IRQ    APIC ID PIN# */
-       smp_write_intsrc(mc, mp_ExtINT,
+       smp_write_lintsrc(mc, mp_ExtINT,
                         MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
                         bus_ck804[0], 0x0, MP_APIC_ALL, 0x0);
-       smp_write_intsrc(mc, mp_NMI,
+       smp_write_lintsrc(mc, mp_NMI,
                         MP_IRQ_TRIGGER_DEFAULT | MP_IRQ_POLARITY_DEFAULT,
                         bus_ck804[0], 0x0, MP_APIC_ALL, 0x1);