Get mptable OEM/product ID from kconfig variables.

[coreboot.git] / src / mainboard / hp / dl145_g3 / mptable.c

diff --git a/src/mainboard/hp/dl145_g3/mptable.c b/src/mainboard/hp/dl145_g3/mptable.c
index 1ce37bd0c6606edc3ec6ad42f57056b43408900b..f23121e634823221256002861698d598dbcb8b6d 100644 (file)
--- a/src/mainboard/hp/dl145_g3/mptable.c
+++ b/src/mainboard/hp/dl145_g3/mptable.c
@@ -43,32 +43,18 @@ static void *smp_write_config_table(void *v)
 {
        struct mp_config_table *mc;
        struct mb_sysconf_t *m;
+       int bus_isa;
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, "TREX        ", LAPIC_ADDR);
+       mptable_init(mc, LAPIC_ADDR);
 
        smp_write_processors(mc);
 
        get_bus_conf();
        m = sysconf.mb;
 
-       /*Bus:         Bus ID  Type*/
-       /* define bus and isa numbers */
-#if 0
-       unsigned char bus_num;
-       for(bus_num = 0; bus_num < m->bus_isa; bus_num++) {
-               smp_write_bus(mc, bus_num, "PCI   ");
-               printk(BIOS_DEBUG, "writing bus %d as PCI...\n",bus_num);
-       }
-#endif
-       smp_write_bus(mc, 0, "PCI   ");
-       smp_write_bus(mc, 1, "PCI   ");
-       smp_write_bus(mc, 7, "PCI   ");
-       smp_write_bus(mc, 8, "PCI   ");
-
-       smp_write_bus(mc,m->bus_isa, "ISA   ");
-       printk(BIOS_DEBUG, "writing %d as ISA...\n",m->bus_isa);
+       mptable_write_buses(mc, NULL, &bus_isa);
 
        /*I/O APICs:   APIC ID Version State           Address*/
        {
@@ -130,7 +116,7 @@ static void *smp_write_config_table(void *v)
                }
        }
 
-       mptable_add_isa_interrupts(mc, m->bus_isa, m->apicid_bcm5785[0], 0);
+       mptable_add_isa_interrupts(mc, bus_isa, m->apicid_bcm5785[0], 0);
 
        //SATA
 /*     printk(BIOS_DEBUG, "MPTABLE_SATA: bus_id:%d irq:%d apic_id:%d pin:%d\n",m->bus_bcm5785_1, (0x0e<<2)|0, m->apicid_bcm5785[0], 0x7); */
@@ -177,9 +163,9 @@ static void *smp_write_config_table(void *v)
        }
 
 /*Local Ints:  Type    Polarity    Trigger     Bus ID   IRQ    APIC ID PIN#*/
-       printk(BIOS_DEBUG, "m->bus_isa is: %x\n",m->bus_isa);
-       smp_write_intsrc(mc, mp_ExtINT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, m->bus_isa, 0x0, MP_APIC_ALL, 0x0);
-       smp_write_intsrc(mc, mp_NMI, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, m->bus_isa , 0x0, MP_APIC_ALL, 0x1);
+       printk(BIOS_DEBUG, "bus_isa is: %x\n", bus_isa);
+       smp_write_lintsrc(mc, mp_ExtINT, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, bus_isa, 0x0, MP_APIC_ALL, 0x0);
+       smp_write_lintsrc(mc, mp_NMI, MP_IRQ_TRIGGER_EDGE|MP_IRQ_POLARITY_HIGH, bus_isa , 0x0, MP_APIC_ALL, 0x1);
 
        //extended table entries
        smp_write_address_space(mc,0 , ADDRESS_TYPE_IO, 0x0, 0x0, 0x0, 0x0001);