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/asus/a8v-e_se | |
| 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/asus/a8v-e_se')
| -rw-r--r-- | src/mainboard/asus/a8v-e_se/acpi_tables.c | 3 | ||||
| -rw-r--r-- | src/mainboard/asus/a8v-e_se/mptable.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/mainboard/asus/a8v-e_se/acpi_tables.c b/src/mainboard/asus/a8v-e_se/acpi_tables.c index 1119fd8fce..fe8d4757ee 100644 --- a/src/mainboard/asus/a8v-e_se/acpi_tables.c +++ b/src/mainboard/asus/a8v-e_se/acpi_tables.c @@ -26,6 +26,7 @@ #include <string.h> #include <arch/acpi.h> #include <arch/smp/mpspec.h> +#include <arch/ioapic.h> #include <device/device.h> #include <device/pci_ids.h> #include "southbridge/via/vt8237r/vt8237r.h" @@ -59,7 +60,7 @@ unsigned long acpi_fill_madt(unsigned long current) /* Write SB IOAPIC. */ current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, - VT8237R_APIC_ID, VT8237R_APIC_BASE, 0); + VT8237R_APIC_ID, IO_APIC_ADDR, 0); /* Write NB IOAPIC. */ current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, diff --git a/src/mainboard/asus/a8v-e_se/mptable.c b/src/mainboard/asus/a8v-e_se/mptable.c index d2529db6db..4260713ae5 100644 --- a/src/mainboard/asus/a8v-e_se/mptable.c +++ b/src/mainboard/asus/a8v-e_se/mptable.c @@ -20,6 +20,7 @@ #include <string.h> #include <stdint.h> #include <arch/smp/mpspec.h> +#include <arch/ioapic.h> #include "southbridge/via/vt8237r/vt8237r.h" #include "southbridge/via/k8t890/k8t890.h" @@ -62,7 +63,7 @@ static void *smp_write_config_table(void *v) smp_write_bus(mc, bus_isa, "ISA "); /* I/O APICs: APIC ID Version State Address */ - smp_write_ioapic(mc, VT8237R_APIC_ID, 0x20, VT8237R_APIC_BASE); + smp_write_ioapic(mc, VT8237R_APIC_ID, 0x20, IO_APIC_ADDR); smp_write_ioapic(mc, K8T890_APIC_ID, 0x20, K8T890_APIC_BASE); mptable_add_isa_interrupts(mc, bus_isa, VT8237R_APIC_ID, 0); |