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

util/mptable/mptable.c

@@ -300,6 +300,7 @@ int 	noisy = 0;
 char *preamble[] = {
 "#include <console/console.h>",
 "#include <arch/smp/mpspec.h>",
+"#include <arch/ioapic.h>",
 "#include <device/pci.h>",
 "#include <string.h>",
 "#include <stdint.h>",
@@ -355,7 +356,7 @@ char *postamble[] = {
 };
 
 char *ioapic_code[] = {
-"	smp_write_ioapic(mc, 2, 0x20, 0xfec00000);",
+"	smp_write_ioapic(mc, 2, 0x20, IO_APIC_ADDR);",
 "	{",
 "		device_t dev;",
 "		struct resource *res;",