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/amd/serengeti_cheetah | |
| 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/amd/serengeti_cheetah')
| -rw-r--r-- | src/mainboard/amd/serengeti_cheetah/acpi_tables.c | 4 | ||||
| -rw-r--r-- | src/mainboard/amd/serengeti_cheetah/mptable.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c index 1b5197e6d7..fd8416f0de 100644 --- a/src/mainboard/amd/serengeti_cheetah/acpi_tables.c +++ b/src/mainboard/amd/serengeti_cheetah/acpi_tables.c @@ -11,13 +11,13 @@ #include <console/console.h> #include <string.h> #include <arch/acpi.h> +#include <arch/ioapic.h> #include <device/pci.h> #include <device/pci_ids.h> #include <cpu/x86/msr.h> #include <cpu/amd/mtrr.h> #include <cpu/amd/amdk8_sysconf.h> #include "northbridge/amd/amdk8/amdk8_acpi.h" - #include "mb_sysconf.h" #define DUMP_ACPI_TABLES 0 @@ -45,8 +45,6 @@ extern const unsigned char AmlCode_ssdt3[]; extern const unsigned char AmlCode_ssdt4[]; #endif -#define IO_APIC_ADDR 0xfec00000UL - unsigned long acpi_fill_mcfg(unsigned long current) { /* Just a dummy */ diff --git a/src/mainboard/amd/serengeti_cheetah/mptable.c b/src/mainboard/amd/serengeti_cheetah/mptable.c index 8541ff4cdf..855d2678a1 100644 --- a/src/mainboard/amd/serengeti_cheetah/mptable.c +++ b/src/mainboard/amd/serengeti_cheetah/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> @@ -54,7 +55,7 @@ static void *smp_write_config_table(void *v) smp_write_bus(mc, m->bus_isa, "ISA "); /*I/O APICs: APIC ID Version State Address*/ - smp_write_ioapic(mc, m->apicid_8111, 0x11, 0xfec00000); //8111 + smp_write_ioapic(mc, m->apicid_8111, 0x11, IO_APIC_ADDR); //8111 { device_t dev; struct resource *res; |