From 74d1a6e8a166cd477f667a6fcb1e96b8a0cbdac1 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Tue, 12 Oct 2010 17:34:08 +0000 Subject: We define IO_APIC_ADDR in , 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 Acked-by: Peter Stuge git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5943 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/northbridge/via/cx700/cx700_lpc.c | 5 +---- src/northbridge/via/vx800/vx800.h | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/northbridge') diff --git a/src/northbridge/via/cx700/cx700_lpc.c b/src/northbridge/via/cx700/cx700_lpc.c index f0fc86cd82..77ab97c145 100644 --- a/src/northbridge/via/cx700/cx700_lpc.c +++ b/src/northbridge/via/cx700/cx700_lpc.c @@ -19,17 +19,14 @@ #include #include - #include #include #include #include - #include #include #include #include - #include #include #include @@ -253,7 +250,7 @@ static void cx700_read_resources(device_t dev) res->flags = IORESOURCE_IO | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; res = new_resource(dev, 3); /* IOAPIC */ - res->base = 0xfec00000; + res->base = IO_APIC_ADDR; res->size = 0x00001000; res->flags = IORESOURCE_MEM | IORESOURCE_ASSIGNED | IORESOURCE_FIXED; } diff --git a/src/northbridge/via/vx800/vx800.h b/src/northbridge/via/vx800/vx800.h index 5606d236da..ad84b104b9 100644 --- a/src/northbridge/via/vx800/vx800.h +++ b/src/northbridge/via/vx800/vx800.h @@ -120,7 +120,6 @@ void enable_vx800_serial(void); #define SB_EHCI_REG 0,0x10, 4, #define VX800SB_APIC_ID 0x4 -#define VX800SB_APIC_BASE 0xfec00000ULL #define VX800SB_APIC_DATA_OFFSET 0x10 #define VX800SB_APIC_ENTRY_NUMBER 0x40 -- cgit v1.2.3