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/via/epia-n | |
| parent | 4ffde94c4ec51cdb24103ec13653e6f40513e1bb (diff) | |
| download | coreboot-74d1a6e8a166cd477f667a6fcb1e96b8a0cbdac1.tar.xz | |
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/via/epia-n')
| -rw-r--r-- | src/mainboard/via/epia-n/acpi_tables.c | 3 | ||||
| -rw-r--r-- | src/mainboard/via/epia-n/mainboard.c | 3 | ||||
| -rw-r--r-- | src/mainboard/via/epia-n/mptable.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/mainboard/via/epia-n/acpi_tables.c b/src/mainboard/via/epia-n/acpi_tables.c index d8b28b25e7..741784e839 100644 --- a/src/mainboard/via/epia-n/acpi_tables.c +++ b/src/mainboard/via/epia-n/acpi_tables.c @@ -30,6 +30,7 @@ #include <console/console.h> #include <string.h> #include <arch/acpi.h> +#include <arch/ioapic.h> #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> @@ -94,7 +95,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, gsi_base); + VT8237R_APIC_ID, IO_APIC_ADDR, gsi_base); /* IRQ0 -> APIC IRQ2. */ current += acpi_create_madt_irqoverride((acpi_madt_irqoverride_t *) diff --git a/src/mainboard/via/epia-n/mainboard.c b/src/mainboard/via/epia-n/mainboard.c index 4206b24d5d..9227f0ab0e 100644 --- a/src/mainboard/via/epia-n/mainboard.c +++ b/src/mainboard/via/epia-n/mainboard.c @@ -23,6 +23,7 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <boot/tables.h> +#include <arch/ioapic.h> #include <southbridge/via/vt8237r/vt8237r.h> #include "chip.h" @@ -30,7 +31,7 @@ int add_mainboard_resources(struct lb_memory *mem) { #if CONFIG_IOAPIC == 1 lb_add_memory_range(mem, LB_MEM_RESERVED, - VT8237R_APIC_BASE, 0x1000); + IO_APIC_ADDR, 0x1000); lb_add_memory_range(mem, LB_MEM_RESERVED, 0xFEE00000ULL, 0x1000); lb_add_memory_range(mem, LB_MEM_RESERVED, diff --git a/src/mainboard/via/epia-n/mptable.c b/src/mainboard/via/epia-n/mptable.c index ddd96bed5c..676c7e1988 100644 --- a/src/mainboard/via/epia-n/mptable.c +++ b/src/mainboard/via/epia-n/mptable.c @@ -2,6 +2,7 @@ /* as modified by RGM for coreboot */ #include <console/console.h> #include <arch/smp/mpspec.h> +#include <arch/ioapic.h> #include <device/pci.h> #include <string.h> #include <stdint.h> @@ -35,7 +36,7 @@ static void *smp_write_config_table(void *v) mptable_write_buses(mc, NULL, &isa_bus); /*I/O APICs: APIC ID Version State Address*/ - smp_write_ioapic(mc, 2, 0x20, 0xfec00000); + smp_write_ioapic(mc, 2, 0x20, IO_APIC_ADDR); { device_t dev; struct resource *res; |