- Update abuild.sh so it will rebuild successfull builds

[coreboot.git] / src / mainboard / newisys / khepri / mptable.c

diff --git a/src/mainboard/newisys/khepri/mptable.c b/src/mainboard/newisys/khepri/mptable.c
index 314a04160b975f1608dc06dfd62d347ada7df6c3..8d7d519654bc72fc2f7ed69f554c14f358165d58 100644 (file)
--- a/src/mainboard/newisys/khepri/mptable.c
+++ b/src/mainboard/newisys/khepri/mptable.c
@@ -4,7 +4,7 @@
 #include <string.h>
 #include <stdint.h>
 
-void *smp_write_config_table(void *v, unsigned long * processor_map)
+void *smp_write_config_table(void *v)
 {
        static const char sig[4] = "PCMP";
        static const char oem[8] = "NEWISYS ";
@@ -33,7 +33,7 @@ void *smp_write_config_table(void *v, unsigned long * processor_map)
        mc->mpe_checksum = 0;
        mc->reserved = 0;
 
-       smp_write_processors(mc, processor_map);
+       smp_write_processors(mc);
 
        {
                device_t dev;
@@ -86,20 +86,22 @@ void *smp_write_config_table(void *v, unsigned long * processor_map)
        smp_write_ioapic(mc, 2, 0x11, 0xfec00000);
        {
                device_t dev;
-               uint32_t base;
+               struct resource *res;
                /* 8131 apic 3 */
                dev = dev_find_slot(1, PCI_DEVFN(0x01,1));
                if (dev) {
-                       base = pci_read_config32(dev, PCI_BASE_ADDRESS_0);
-                       base &= PCI_BASE_ADDRESS_MEM_MASK;
-                       smp_write_ioapic(mc, 0x03, 0x11, base);
+                       res = find_resource(dev, PCI_BASE_ADDRESS_0);
+                       if (res) {
+                               smp_write_ioapic(mc, 0x03, 0x11, res->base);
+                       }
                }
                /* 8131 apic 4 */
                dev = dev_find_slot(1, PCI_DEVFN(0x02,1));
                if (dev) {
-                       base = pci_read_config32(dev, PCI_BASE_ADDRESS_0);
-                       base &= PCI_BASE_ADDRESS_MEM_MASK;
-                       smp_write_ioapic(mc, 0x04, 0x11, base);
+                       res = find_resource(dev, PCI_BASE_ADDRESS_0);
+                       if (res) {
+                               smp_write_ioapic(mc, 0x04, 0x11, res->base);
+                       }
                }
        }
 
@@ -216,17 +218,16 @@ void *smp_write_config_table(void *v, unsigned long * processor_map)
 
        /* Compute the checksums */
        mc->mpe_checksum = smp_compute_checksum(smp_next_mpc_entry(mc), mc->mpe_length);
-
        mc->mpc_checksum = smp_compute_checksum(mc, mc->mpc_length);
        printk_debug("Wrote the mp table end at: %p - %p\n",
                mc, smp_next_mpe_entry(mc));
        return smp_next_mpe_entry(mc);
 }
 
-unsigned long write_smp_table(unsigned long addr, unsigned long *processor_map)
+unsigned long write_smp_table(unsigned long addr)
 {
        void *v;
        v = smp_write_floating_table(addr);
-       return (unsigned long)smp_write_config_table(v, processor_map);
+       return (unsigned long)smp_write_config_table(v);
 }