diff options
| author | Uwe Hermann <uwe@hermann-uwe.de> | 2010-10-12 17:34:08 +0000 |
|---|---|---|
| committer | Uwe Hermann <uwe@hermann-uwe.de> | 2010-10-12 17:34:08 +0000 |
| commit | 74d1a6e8a166cd477f667a6fcb1e96b8a0cbdac1 (patch) | |
| tree | 9cbdbe86bd282da60bfcbef7108ca6790bcde94e /src/mainboard/supermicro | |
| parent | 4ffde94c4ec51cdb24103ec13653e6f40513e1bb (diff) | |
We define IO_APIC_ADDR in <arch/ioapic.h>, let's use it.
As both ioapic.h and acpi.h define a macro named "NMI", rename one
of them (NMI -> NMIType in acpi.h).
Abuild-tested.
Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5943 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/supermicro')
| -rw-r--r-- | src/mainboard/supermicro/x6dai_g/mptable.c | 5 | ||||
| -rw-r--r-- | src/mainboard/supermicro/x6dhe_g/mptable.c | 5 | ||||
| -rw-r--r-- | src/mainboard/supermicro/x6dhe_g2/mptable.c | 5 | ||||
| -rw-r--r-- | src/mainboard/supermicro/x6dhr_ig/mptable.c | 3 | ||||
| -rw-r--r-- | src/mainboard/supermicro/x6dhr_ig2/mptable.c | 3 |
5 files changed, 13 insertions, 8 deletions
diff --git a/src/mainboard/supermicro/x6dai_g/mptable.c b/src/mainboard/supermicro/x6dai_g/mptable.c index f50f876597..d13c308597 100644 --- a/src/mainboard/supermicro/x6dai_g/mptable.c +++ b/src/mainboard/supermicro/x6dai_g/mptable.c @@ -1,5 +1,6 @@ #include <console/console.h> #include <arch/smp/mpspec.h> +#include <arch/ioapic.h> #include <device/pci.h> #include <string.h> #include <stdint.h> @@ -58,8 +59,8 @@ static void *smp_write_config_table(void *v) /* IOAPIC handling */ - smp_write_ioapic(mc, 2, 0x20, 0xfec00000); - smp_write_ioapic(mc, 3, 0x20, 0xfec10000); + smp_write_ioapic(mc, 2, 0x20, IO_APIC_ADDR); + smp_write_ioapic(mc, 3, 0x20, IO_APIC_ADDR + 0x10000); mptable_add_isa_interrupts(mc, bus_isa, 0x2, 0); diff --git a/src/mainboard/supermicro/x6dhe_g/mptable.c b/src/mainboard/supermicro/x6dhe_g/mptable.c index 65bb1b9293..ba712d3fed 100644 --- a/src/mainboard/supermicro/x6dhe_g/mptable.c +++ b/src/mainboard/supermicro/x6dhe_g/mptable.c @@ -1,5 +1,6 @@ #include <console/console.h> #include <arch/smp/mpspec.h> +#include <arch/ioapic.h> #include <device/pci.h> #include <string.h> #include <stdint.h> @@ -84,8 +85,8 @@ static void *smp_write_config_table(void *v) /* IOAPIC handling */ - smp_write_ioapic(mc, 2, 0x20, 0xfec00000); - smp_write_ioapic(mc, 3, 0x20, 0xfec10000); + smp_write_ioapic(mc, 2, 0x20, IO_APIC_ADDR); + smp_write_ioapic(mc, 3, 0x20, IO_APIC_ADDR + 0x10000); { struct resource *res; device_t dev; diff --git a/src/mainboard/supermicro/x6dhe_g2/mptable.c b/src/mainboard/supermicro/x6dhe_g2/mptable.c index c961d375fa..50b6299b4f 100644 --- a/src/mainboard/supermicro/x6dhe_g2/mptable.c +++ b/src/mainboard/supermicro/x6dhe_g2/mptable.c @@ -1,5 +1,6 @@ #include <console/console.h> #include <arch/smp/mpspec.h> +#include <arch/ioapic.h> #include <device/pci.h> #include <string.h> #include <stdint.h> @@ -84,8 +85,8 @@ static void *smp_write_config_table(void *v) /* IOAPIC handling */ - smp_write_ioapic(mc, 2, 0x20, 0xfec00000); - smp_write_ioapic(mc, 3, 0x20, 0xfec10000); + smp_write_ioapic(mc, 2, 0x20, IO_APIC_ADDR); + smp_write_ioapic(mc, 3, 0x20, IO_APIC_ADDR + 0x10000); { struct resource *res; device_t dev; diff --git a/src/mainboard/supermicro/x6dhr_ig/mptable.c b/src/mainboard/supermicro/x6dhr_ig/mptable.c index 1164e7fa3d..c16017bf93 100644 --- a/src/mainboard/supermicro/x6dhr_ig/mptable.c +++ b/src/mainboard/supermicro/x6dhr_ig/mptable.c @@ -1,5 +1,6 @@ #include <console/console.h> #include <arch/smp/mpspec.h> +#include <arch/ioapic.h> #include <device/pci.h> #include <string.h> #include <stdint.h> @@ -109,7 +110,7 @@ static void *smp_write_config_table(void *v) /* IOAPIC handling */ - smp_write_ioapic(mc, 2, 0x20, 0xfec00000); + smp_write_ioapic(mc, 2, 0x20, IO_APIC_ADDR); { struct resource *res; device_t dev; diff --git a/src/mainboard/supermicro/x6dhr_ig2/mptable.c b/src/mainboard/supermicro/x6dhr_ig2/mptable.c index 1ee769d866..146b40a1b2 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/mptable.c +++ b/src/mainboard/supermicro/x6dhr_ig2/mptable.c @@ -1,5 +1,6 @@ #include <console/console.h> #include <arch/smp/mpspec.h> +#include <arch/ioapic.h> #include <device/pci.h> #include <string.h> #include <stdint.h> @@ -109,7 +110,7 @@ static void *smp_write_config_table(void *v) /* IOAPIC handling */ - smp_write_ioapic(mc, 2, 0x20, 0xfec00000); + smp_write_ioapic(mc, 2, 0x20, IO_APIC_ADDR); { struct resource *res; device_t dev; |