Unify Local APIC address definitions

We used several names for that same value, and hardcoded the value
at some more places.

They're all LOCAL_APIC_ADDR now (except for lapic specific code
that still uses LAPIC_DEFAULT_BASE).

Change-Id: I1d4be73b1984f22b7e84681edfadf0588a7589b6
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/676
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

diff --git a/Makefile.inc b/Makefile.inc
index 2f61a45b812a6f7db3ef9d3af18170baf57221d3..e495f4587e684feb885055c82c6aadf6763676f1 100644 (file)
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -69,7 +69,7 @@ romstage-c-deps:=$$(OPTION_TABLE_H)
 define ramstage-objs_asl_template
 $(obj)/$(1).ramstage.o: src/$(1).asl $(obj)/config.h
        @printf "    IASL       $$(subst $(top)/,,$$(@))\n"
-       $(CC) -x assembler-with-cpp -E -MMD -MT $$(@) -D__ACPI__ -P -include $(abspath $(obj)/config.h) -I$(src) -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
+       $(CC) -x assembler-with-cpp -E -MMD -MT $$(@) -D__ACPI__ -P -include $(abspath $(obj)/config.h) -I$(src) -I$(src)/include -I$(src)/arch/$(ARCHDIR-y)/include -I$(src)/mainboard/$(MAINBOARDDIR) $$< -o $$(basename $$@).asl
        cd $$(dir $$@); $(IASL) -p $$(notdir $$@) -tc $$(notdir $$(basename $$@)).asl
        mv $$(basename $$@).hex $$(basename $$@).c
        $(CC) $$(CFLAGS) $$(if $$(subst dsdt,,$$(basename $$(notdir $(1)))), -DAmlCode=AmlCode_$$(basename $$(notdir $(1)))) -c -o $$@ $$(basename $$@).c

diff --git a/src/arch/x86/boot/acpi.c b/src/arch/x86/boot/acpi.c
index f1be0345e491b4d39270d907ed027467aee3afa1..168933a7263140870b531b099a77cb5ff7d5c2c4 100644 (file)
--- a/src/arch/x86/boot/acpi.c
+++ b/src/arch/x86/boot/acpi.c
@@ -31,6 +31,7 @@
 #include <arch/acpigen.h>
 #include <device/pci.h>
 #include <cbmem.h>
+#include <cpu/x86/lapic_def.h>
 
 u8 acpi_checksum(u8 *table, u32 length)
 {
@@ -188,8 +189,6 @@ int acpi_create_madt_lapic_nmi(acpi_madt_lapic_nmi_t *lapic_nmi, u8 cpu,
 
 void acpi_create_madt(acpi_madt_t *madt)
 {
-#define LOCAL_APIC_ADDR        0xfee00000ULL
-
        acpi_header_t *header = &(madt->header);
        unsigned long current = (unsigned long)madt + sizeof(acpi_madt_t);
 

diff --git a/src/arch/x86/include/arch/ioapic.h b/src/arch/x86/include/arch/ioapic.h
index 623f617253ea4c41f68ed4aaa8c8b3bace39dea4..5d7e19649e21a40a5dbb237194b82fa96338a9d0 100644 (file)
--- a/src/arch/x86/include/arch/ioapic.h
+++ b/src/arch/x86/include/arch/ioapic.h
@@ -20,7 +20,7 @@
 #ifndef __I386_ARCH_IOAPIC_H
 #define __I386_ARCH_IOAPIC_H
 
-#define IO_APIC_ADDR   0xfec00000UL
+#define IO_APIC_ADDR   0xfec00000
 #define IO_APIC_INTERRUPTS 24
 
 #define ALL            (0xff << 24)
@@ -38,7 +38,9 @@
 #define SMI            (2 << 8)
 #define INT            (1 << 8)
 
+#ifndef __ACPI__
 void setup_ioapic(u32 ioapic_base, u8 ioapic_id);
 void clear_ioapic(u32 ioapic_base);
+#endif
 
 #endif

diff --git a/src/arch/x86/include/arch/smp/mpspec.h b/src/arch/x86/include/arch/smp/mpspec.h
index 2eb18138a6f5773a54adcd78810d0c3c3431c2e7..e5e6195cd50b24b35e6499b5a5d15c6f46004e08 100644 (file)
--- a/src/arch/x86/include/arch/smp/mpspec.h
+++ b/src/arch/x86/include/arch/smp/mpspec.h
@@ -2,6 +2,8 @@
 #define __ASM_MPSPEC_H
 
 #include <device/device.h>
+#include <cpu/x86/lapic_def.h>
+
 /*
  * Structure definitions for SMP machines following the
  * Intel Multiprocessing Specification 1.1 and 1.4.
@@ -229,9 +231,6 @@ struct mp_exten_compatibility_address_space {
         */
 } __attribute__((packed));
 
-/* Default local apic addr */
-#define LAPIC_ADDR 0xFEE00000
-
 void mptable_init(struct mp_config_table *mc, u32 lapic_addr);
 
 void *smp_next_mpc_entry(struct mp_config_table *mc);

diff --git a/src/include/cpu/x86/lapic_def.h b/src/include/cpu/x86/lapic_def.h
index 6035273afc140181bb5c9311994bf38daa1b9abe..f96b53b42a60b54e50745ed81ff0fb1fdf1aee01 100644 (file)
--- a/src/include/cpu/x86/lapic_def.h
+++ b/src/include/cpu/x86/lapic_def.h
@@ -6,7 +6,8 @@
 #define LAPIC_BASE_MSR_ENABLE (1 << 11)
 #define LAPIC_BASE_MSR_ADDR_MASK 0xFFFFF000
 
-#define LAPIC_DEFAULT_BASE 0xfee00000
+#define LOCAL_APIC_ADDR 0xfee00000
+#define LAPIC_DEFAULT_BASE LOCAL_APIC_ADDR
 
 #define LAPIC_ID               0x020
 #define LAPIC_LVR      0x030

diff --git a/src/mainboard/advansus/a785e-i/mptable.c b/src/mainboard/advansus/a785e-i/mptable.c
index 65040498dfb96df67523c7c4b03b54292faf3ca7..864332010169ff6927be28d72f2bf97e5cc94fe3 100644 (file)
--- a/src/mainboard/advansus/a785e-i/mptable.c
+++ b/src/mainboard/advansus/a785e-i/mptable.c
@@ -52,7 +52,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/amd/bimini_fam10/mptable.c b/src/mainboard/amd/bimini_fam10/mptable.c
index 2ab3f24ee936124fcea0c3ed0f7f2ddc59f8bdde..ae81411e2e05730bc3a498e3f9dc35c55dfadcb2 100644 (file)
--- a/src/mainboard/amd/bimini_fam10/mptable.c
+++ b/src/mainboard/amd/bimini_fam10/mptable.c
@@ -52,7 +52,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/amd/dbm690t/mptable.c b/src/mainboard/amd/dbm690t/mptable.c
index 901591adbb6d5e61ba28e43456955a902c6be498..cf98ae30d9809631c0894ed5f0b844198d48d6f5 100644 (file)
--- a/src/mainboard/amd/dbm690t/mptable.c
+++ b/src/mainboard/amd/dbm690t/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/amd/dinar/mptable.c b/src/mainboard/amd/dinar/mptable.c
index b43080d842cf329db2d7be7db1373ac072d94876..4938be0848ed1ab3cf5dbad43000781ea88fcd93 100644 (file)
--- a/src/mainboard/amd/dinar/mptable.c
+++ b/src/mainboard/amd/dinar/mptable.c
@@ -44,7 +44,7 @@ static void *smp_write_config_table(void *v)
        u32 dword;
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
        get_bus_conf();

diff --git a/src/mainboard/amd/inagua/mptable.c b/src/mainboard/amd/inagua/mptable.c
index b3393480ab9d91b5dec0a953c3111e034f2f37c4..b5a507f248b30f16477413dee085846f91bdeb79 100644 (file)
--- a/src/mainboard/amd/inagua/mptable.c
+++ b/src/mainboard/amd/inagua/mptable.c
@@ -55,7 +55,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
        memcpy(mc->mpc_oem, "AMD     ", 8);
 
        smp_write_processors(mc);

diff --git a/src/mainboard/amd/mahogany/mptable.c b/src/mainboard/amd/mahogany/mptable.c
index f79a5791abda02064d41001961c6bec47d988672..dabd2ed574e4588e385dfdfc0aff8570b52587f3 100644 (file)
--- a/src/mainboard/amd/mahogany/mptable.c
+++ b/src/mainboard/amd/mahogany/mptable.c
@@ -41,7 +41,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/amd/mahogany_fam10/mptable.c b/src/mainboard/amd/mahogany_fam10/mptable.c
index b1a658be4135018a7b873d042364c60107288a84..c56952e934964816e309bb8ada9b166d4164746f 100644 (file)
--- a/src/mainboard/amd/mahogany_fam10/mptable.c
+++ b/src/mainboard/amd/mahogany_fam10/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/amd/persimmon/mptable.c b/src/mainboard/amd/persimmon/mptable.c
index 18a7707c10a21f682cd4be00b06294e85428804a..61ddef184e0e34e3d1476872ad61fa4b9a105dc7 100644 (file)
--- a/src/mainboard/amd/persimmon/mptable.c
+++ b/src/mainboard/amd/persimmon/mptable.c
@@ -51,7 +51,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
        memcpy(mc->mpc_oem, "AMD         ", 8);
 
        smp_write_processors(mc);

diff --git a/src/mainboard/amd/pistachio/mptable.c b/src/mainboard/amd/pistachio/mptable.c
index 901591adbb6d5e61ba28e43456955a902c6be498..cf98ae30d9809631c0894ed5f0b844198d48d6f5 100644 (file)
--- a/src/mainboard/amd/pistachio/mptable.c
+++ b/src/mainboard/amd/pistachio/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/amd/serengeti_cheetah/acpi/amd8111_isa.asl b/src/mainboard/amd/serengeti_cheetah/acpi/amd8111_isa.asl
index 0f7efc9ee9be9c34e4b6b93827868531aae7a801..56c0a1679f051a92bd07a7f5a5e0ef254b25637d 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/acpi/amd8111_isa.asl
+++ b/src/mainboard/amd/serengeti_cheetah/acpi/amd8111_isa.asl
@@ -1,3 +1,6 @@
+#include <arch/ioapic.h>
+#include <cpu/x86/lapic_def.h>
+
 /*
  * Copyright 2005 AMD
  */
@@ -125,9 +128,9 @@
                         {
                             Memory32Fixed (ReadWrite, 0x000E0000, 0x00020000) // BIOS E4000-FFFFF
                             Memory32Fixed (ReadWrite, 0x000C0000, 0x00010000) // video BIOS c0000-c8404
-                            Memory32Fixed (ReadWrite, 0xFEC00000, 0x00001000) // I/O APIC
+                            Memory32Fixed (ReadWrite, IO_APIC_ADDR, 0x00001000)
                             Memory32Fixed (ReadWrite, 0xFFC00000, 0x00380000) // LPC forwarded, 4 MB w/ROM
-                            Memory32Fixed (ReadWrite, 0xFEE00000, 0x00001000) // Local APIC
+                            Memory32Fixed (ReadWrite, LOCAL_APIC_ADDR, 0x00001000)
                             Memory32Fixed (ReadWrite, 0xFFF80000, 0x00080000) // Overlay BIOS
                             Memory32Fixed (ReadWrite, 0x00000000, 0x00000000) // Overlay BIOS
                             Memory32Fixed (ReadWrite, 0x00000000, 0x00000000) // Overlay BIOS

diff --git a/src/mainboard/amd/serengeti_cheetah/mptable.c b/src/mainboard/amd/serengeti_cheetah/mptable.c
index ebd4cbc60f02b63e04fcbc818ca757dfdc4a8f9f..4214408b86a42155f9a1c70ac397c1827416938e 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah/mptable.c
+++ b/src/mainboard/amd/serengeti_cheetah/mptable.c
@@ -18,7 +18,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl
index f00069fc873bf31cbbd913ff59a8c7e1ad30549b..3b7945369d3ee96d10638881cfb785d7ac25507f 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/acpi/amd8111_isa.asl
@@ -17,6 +17,9 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 //
 
+#include <arch/ioapic.h>
+#include <cpu/x86/lapic_def.h>
+
 //AMD8111 isa
 
        Device (ISA)
@@ -141,9 +144,9 @@
                                {
                                        Memory32Fixed (ReadWrite, 0x000E0000, 0x00020000) // BIOS E4000-FFFFF
                                        Memory32Fixed (ReadWrite, 0x000C0000, 0x00010000) // video BIOS c0000-c8404
-                                       Memory32Fixed (ReadWrite, 0xFEC00000, 0x00001000) // I/O APIC
+                                       Memory32Fixed (ReadWrite, IO_APIC_ADDR, 0x00001000)
                                        Memory32Fixed (ReadWrite, 0xFFC00000, 0x00380000) // LPC forwarded, 4 MB w/ROM
-                                       Memory32Fixed (ReadWrite, 0xFEE00000, 0x00001000) // Local APIC
+                                       Memory32Fixed (ReadWrite, LOCAL_APIC_ADDR, 0x00001000)
                                        Memory32Fixed (ReadWrite, 0xFFF80000, 0x00080000) // Overlay BIOS
                                        Memory32Fixed (ReadWrite, 0x00000000, 0x00000000) // Overlay BIOS
                                        Memory32Fixed (ReadWrite, 0x00000000, 0x00000000) // Overlay BIOS

diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
index d527f9c5059c1c1aaea8f8a94a8ba518178f8c32..e90b348acb6c23fbcdcc10c10937eb2053efea44 100644 (file)
--- a/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/mptable.c
@@ -37,7 +37,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/amd/south_station/mptable.c b/src/mainboard/amd/south_station/mptable.c
index 5242f69bf19eb6c10ee6926a87f7589ccb64f223..99004b3f2e5952fb525459f9fc73f1bb9cbf6741 100644 (file)
--- a/src/mainboard/amd/south_station/mptable.c
+++ b/src/mainboard/amd/south_station/mptable.c
@@ -51,7 +51,7 @@ static void *smp_write_config_table(void *v)
 
   mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-  mptable_init(mc, LAPIC_ADDR);
+  mptable_init(mc, LOCAL_APIC_ADDR);
   memcpy(mc->mpc_oem, "AMD     ", 8);
 
   smp_write_processors(mc);

diff --git a/src/mainboard/amd/tilapia_fam10/mptable.c b/src/mainboard/amd/tilapia_fam10/mptable.c
index 4bf3480fcf5b14e8dbb63e3fb9c629175e1c6c6a..4a276fb0c3c8ee60f8d858f9d4fd561feb42861e 100644 (file)
--- a/src/mainboard/amd/tilapia_fam10/mptable.c
+++ b/src/mainboard/amd/tilapia_fam10/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/amd/torpedo/mptable.c b/src/mainboard/amd/torpedo/mptable.c
index 97db2b9a9b56fedca9f7ab2f82bf91da2905f9c2..936a41717c9494647b1589e66f9d90807290bbe0 100644 (file)
--- a/src/mainboard/amd/torpedo/mptable.c
+++ b/src/mainboard/amd/torpedo/mptable.c
@@ -84,7 +84,7 @@ static void *smp_write_config_table(void *v)
 
   mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-  mptable_init(mc, LAPIC_ADDR);
+  mptable_init(mc, LOCAL_APIC_ADDR);
   memcpy(mc->mpc_oem, "AMD     ", 8);
 
   /*Inagua used dure core cpu with one die */

diff --git a/src/mainboard/amd/union_station/mptable.c b/src/mainboard/amd/union_station/mptable.c
index 5242f69bf19eb6c10ee6926a87f7589ccb64f223..99004b3f2e5952fb525459f9fc73f1bb9cbf6741 100644 (file)
--- a/src/mainboard/amd/union_station/mptable.c
+++ b/src/mainboard/amd/union_station/mptable.c
@@ -51,7 +51,7 @@ static void *smp_write_config_table(void *v)
 
   mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-  mptable_init(mc, LAPIC_ADDR);
+  mptable_init(mc, LOCAL_APIC_ADDR);
   memcpy(mc->mpc_oem, "AMD     ", 8);
 
   smp_write_processors(mc);

diff --git a/src/mainboard/arima/hdama/mptable.c b/src/mainboard/arima/hdama/mptable.c
index 466ba882e6dcb0d3114a0f5de4fdcd2b7246bb7f..f67327e891675066757fe7d01cff4606328c243f 100644 (file)
--- a/src/mainboard/arima/hdama/mptable.c
+++ b/src/mainboard/arima/hdama/mptable.c
@@ -75,7 +75,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/asrock/939a785gmh/mptable.c b/src/mainboard/asrock/939a785gmh/mptable.c
index 95b127184ec5309e50d176bf9c10e173831c5651..c0ca5503c40da27409711365d583fabaf8e13c09 100644 (file)
--- a/src/mainboard/asrock/939a785gmh/mptable.c
+++ b/src/mainboard/asrock/939a785gmh/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/asrock/e350m1/mptable.c b/src/mainboard/asrock/e350m1/mptable.c
index de9d7f4c647ca3ad262b824f636894a76606aeb1..7e8c947b5733d662c7299402cd868cfda65a12c6 100644 (file)
--- a/src/mainboard/asrock/e350m1/mptable.c
+++ b/src/mainboard/asrock/e350m1/mptable.c
@@ -50,7 +50,7 @@ static void *smp_write_config_table(void *v)
 
   mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-  mptable_init(mc, LAPIC_ADDR);
+  mptable_init(mc, LOCAL_APIC_ADDR);
   memcpy(mc->mpc_oem, "ASROCK  ", 8);
 
   smp_write_processors(mc);

diff --git a/src/mainboard/asus/a8n_e/mptable.c b/src/mainboard/asus/a8n_e/mptable.c
index 349ae74979572f7c8118e978f1566248b6252370..9defdb5a12cad8a0286e6bde109162831493bda1 100644 (file)
--- a/src/mainboard/asus/a8n_e/mptable.c
+++ b/src/mainboard/asus/a8n_e/mptable.c
@@ -39,7 +39,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/asus/a8v-e_deluxe/mptable.c b/src/mainboard/asus/a8v-e_deluxe/mptable.c
index 999dd6cd33bf64bba70853351eef1dae7a8125fc..eb7790f0d6fc893c359bfb58a73b08a960192785 100644 (file)
--- a/src/mainboard/asus/a8v-e_deluxe/mptable.c
+++ b/src/mainboard/asus/a8v-e_deluxe/mptable.c
@@ -31,7 +31,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/asus/a8v-e_se/mptable.c b/src/mainboard/asus/a8v-e_se/mptable.c
index 999dd6cd33bf64bba70853351eef1dae7a8125fc..eb7790f0d6fc893c359bfb58a73b08a960192785 100644 (file)
--- a/src/mainboard/asus/a8v-e_se/mptable.c
+++ b/src/mainboard/asus/a8v-e_se/mptable.c
@@ -31,7 +31,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/asus/k8v-x/mptable.c b/src/mainboard/asus/k8v-x/mptable.c
index 673dfbefbed20f294bace8d991dc744be49aefde..48eee717be8ced015e380ee9964303d67a6a2471 100644 (file)
--- a/src/mainboard/asus/k8v-x/mptable.c
+++ b/src/mainboard/asus/k8v-x/mptable.c
@@ -31,7 +31,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/asus/m2n-e/mptable.c b/src/mainboard/asus/m2n-e/mptable.c
index 29b9d07e444c13e9df0d6dbec07669dc934bfa65..680dfa75bc2feb536bb51b4fb95fae86116bea54 100644 (file)
--- a/src/mainboard/asus/m2n-e/mptable.c
+++ b/src/mainboard/asus/m2n-e/mptable.c
@@ -43,7 +43,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/asus/m2v/mptable.c b/src/mainboard/asus/m2v/mptable.c
index 5dc340a9bab11d50b88909796cd1abee7e48be6a..e6e600a0151d0a19e6711d4b41ac3c4269930416 100644 (file)
--- a/src/mainboard/asus/m2v/mptable.c
+++ b/src/mainboard/asus/m2v/mptable.c
@@ -42,7 +42,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void*)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
        mptable_write_buses(mc, NULL, &bus_isa);

diff --git a/src/mainboard/asus/m4a78-em/mptable.c b/src/mainboard/asus/m4a78-em/mptable.c
index 4bf3480fcf5b14e8dbb63e3fb9c629175e1c6c6a..4a276fb0c3c8ee60f8d858f9d4fd561feb42861e 100644 (file)
--- a/src/mainboard/asus/m4a78-em/mptable.c
+++ b/src/mainboard/asus/m4a78-em/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/asus/m4a785-m/mptable.c b/src/mainboard/asus/m4a785-m/mptable.c
index 4bf3480fcf5b14e8dbb63e3fb9c629175e1c6c6a..4a276fb0c3c8ee60f8d858f9d4fd561feb42861e 100644 (file)
--- a/src/mainboard/asus/m4a785-m/mptable.c
+++ b/src/mainboard/asus/m4a785-m/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/asus/m5a88-v/mptable.c b/src/mainboard/asus/m5a88-v/mptable.c
index 516b915c45912d46fa921b83be1da5ee32032595..ac8ed5e45bc906ca0c57f36961e06213b11379ca 100644 (file)
--- a/src/mainboard/asus/m5a88-v/mptable.c
+++ b/src/mainboard/asus/m5a88-v/mptable.c
@@ -52,7 +52,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/asus/p2b-d/mptable.c b/src/mainboard/asus/p2b-d/mptable.c
index 43f3a85f1e488e1a44ee3cd7990e7647aac3a5bd..4eed581c9081fa1ad7ea371084da0af122559d50 100644 (file)
--- a/src/mainboard/asus/p2b-d/mptable.c
+++ b/src/mainboard/asus/p2b-d/mptable.c
@@ -32,7 +32,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/asus/p2b-ds/mptable.c b/src/mainboard/asus/p2b-ds/mptable.c
index 153c62c5c60053aa1ab0b9343765c52e974c6401..5333418a16bedea5112052bb21f4a6ea07895574 100644 (file)
--- a/src/mainboard/asus/p2b-ds/mptable.c
+++ b/src/mainboard/asus/p2b-ds/mptable.c
@@ -32,7 +32,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/avalue/eax-785e/mptable.c b/src/mainboard/avalue/eax-785e/mptable.c
index 021f6355e6c7ef6672c880a8b3f825e051587734..6f541a001238afa972dad57f0fd5ec975c04869a 100644 (file)
--- a/src/mainboard/avalue/eax-785e/mptable.c
+++ b/src/mainboard/avalue/eax-785e/mptable.c
@@ -52,7 +52,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/broadcom/blast/mptable.c b/src/mainboard/broadcom/blast/mptable.c
index b747d2eae5274e31b95d6328298426af235be4eb..5a1bf28bf3334dc9a1582ed50cf29aaf918a6d59 100644 (file)
--- a/src/mainboard/broadcom/blast/mptable.c
+++ b/src/mainboard/broadcom/blast/mptable.c
@@ -24,7 +24,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/dell/s1850/mptable.c b/src/mainboard/dell/s1850/mptable.c
index a71dab03a26705dad3b11bbffb9d7f49e2b8f679..0c7562c5721f5303e97793e7371b65dc919b95e5 100644 (file)
--- a/src/mainboard/dell/s1850/mptable.c
+++ b/src/mainboard/dell/s1850/mptable.c
@@ -17,7 +17,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/emulation/qemu-x86/northbridge.c b/src/mainboard/emulation/qemu-x86/northbridge.c
index 3f2243786da594886e79fdd69095dfbd613dbe54..b961e8b60c78630e7798836afbd83828ce08cda6 100644 (file)
--- a/src/mainboard/emulation/qemu-x86/northbridge.c
+++ b/src/mainboard/emulation/qemu-x86/northbridge.c
@@ -1,4 +1,5 @@
 #include <console/console.h>
+#include <cpu/x86/lapic_def.h>
 #include <arch/io.h>
 #include <arch/ioapic.h>
 #include <stdint.h>
@@ -80,7 +81,7 @@ static void cpu_pci_domain_read_resources(struct device *dev)
        /* Reserve space for the LAPIC.  There's one in every processor, but
         * the space only needs to be reserved once, so we do it here. */
        res = new_resource(dev, 3);
-       res->base = 0xfee00000UL;
+       res->base = LOCAL_APIC_ADDR;
        res->size = 0x10000UL;
        res->limit = 0xffffffffUL;
        res->flags = IORESOURCE_MEM | IORESOURCE_FIXED | IORESOURCE_STORED |

diff --git a/src/mainboard/getac/p470/mptable.c b/src/mainboard/getac/p470/mptable.c
index 5954c9714f38ec6e2eea19fd3dbca636f8f6e880..9b59bb470edcd7e4c6c10abfbcea60f48b407b3c 100644 (file)
--- a/src/mainboard/getac/p470/mptable.c
+++ b/src/mainboard/getac/p470/mptable.c
@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/gigabyte/ga_2761gxdk/mptable.c b/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
index b52cda9c77fc6d3a9ea71b84fdc3e5371bd3c222..914b25a9a7427dbd0246aafec3c806e14082f161 100644 (file)
--- a/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
+++ b/src/mainboard/gigabyte/ga_2761gxdk/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/gigabyte/m57sli/mptable.c b/src/mainboard/gigabyte/m57sli/mptable.c
index 5aa7e611e690167d784a254e758172821e2250d1..f493514730d4570ab77434157fc992eda557fc5d 100644 (file)
--- a/src/mainboard/gigabyte/m57sli/mptable.c
+++ b/src/mainboard/gigabyte/m57sli/mptable.c
@@ -39,7 +39,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/gigabyte/ma785gmt/mptable.c b/src/mainboard/gigabyte/ma785gmt/mptable.c
index 4bf3480fcf5b14e8dbb63e3fb9c629175e1c6c6a..4a276fb0c3c8ee60f8d858f9d4fd561feb42861e 100644 (file)
--- a/src/mainboard/gigabyte/ma785gmt/mptable.c
+++ b/src/mainboard/gigabyte/ma785gmt/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/gigabyte/ma78gm/mptable.c b/src/mainboard/gigabyte/ma78gm/mptable.c
index 4bf3480fcf5b14e8dbb63e3fb9c629175e1c6c6a..4a276fb0c3c8ee60f8d858f9d4fd561feb42861e 100644 (file)
--- a/src/mainboard/gigabyte/ma78gm/mptable.c
+++ b/src/mainboard/gigabyte/ma78gm/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/hp/dl145_g1/mptable.c b/src/mainboard/hp/dl145_g1/mptable.c
index e33f6814a79cdc277b94acedb3eecbed3c36a951..35dedde5258c7c70c7a74aafee40857ef9383e68 100644 (file)
--- a/src/mainboard/hp/dl145_g1/mptable.c
+++ b/src/mainboard/hp/dl145_g1/mptable.c
@@ -14,7 +14,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/hp/dl145_g3/mptable.c b/src/mainboard/hp/dl145_g3/mptable.c
index 466b7fcf4c645417dfc9cb0b2a2d42f1ee9924c0..609432aaa018986458cf6b5bb16301347f7e814b 100644 (file)
--- a/src/mainboard/hp/dl145_g3/mptable.c
+++ b/src/mainboard/hp/dl145_g3/mptable.c
@@ -47,7 +47,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/hp/dl165_g6_fam10/mptable.c b/src/mainboard/hp/dl165_g6_fam10/mptable.c
index c2467216ebbad6f75ff5fc94998b03d2a9d654c3..00234a31dcd3dee9a318924714ed60471fc8f9ed 100644 (file)
--- a/src/mainboard/hp/dl165_g6_fam10/mptable.c
+++ b/src/mainboard/hp/dl165_g6_fam10/mptable.c
@@ -48,7 +48,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/ibase/mb899/mptable.c b/src/mainboard/ibase/mb899/mptable.c
index 0ff189657ed88f0cac76ef23485f90df078f3161..1baf72838e8bbeb5a5376e7b27cfdf40acd3534a 100644 (file)
--- a/src/mainboard/ibase/mb899/mptable.c
+++ b/src/mainboard/ibase/mb899/mptable.c
@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/ibm/e325/mptable.c b/src/mainboard/ibm/e325/mptable.c
index 6431f321db1711a3b88b446f9982f27b6b8c0348..7d1b8f3043c506cdf1900837c9a8b618f308a34d 100644 (file)
--- a/src/mainboard/ibm/e325/mptable.c
+++ b/src/mainboard/ibm/e325/mptable.c
@@ -17,7 +17,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/ibm/e326/mptable.c b/src/mainboard/ibm/e326/mptable.c
index e81bf8fd6ed06ebe006f257478c1c4a712b144ab..b963a0c0c58c94bc49e9827d6e98c1a41b6138a5 100644 (file)
--- a/src/mainboard/ibm/e326/mptable.c
+++ b/src/mainboard/ibm/e326/mptable.c
@@ -17,7 +17,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/iei/kino-780am2-fam10/mptable.c b/src/mainboard/iei/kino-780am2-fam10/mptable.c
index 66423e560bd0d9fb08e59d5f9c60e0e7587d56f1..a26fbde463b8ffac699450c199225e11e66a62ab 100644 (file)
--- a/src/mainboard/iei/kino-780am2-fam10/mptable.c
+++ b/src/mainboard/iei/kino-780am2-fam10/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/intel/d945gclf/mptable.c b/src/mainboard/intel/d945gclf/mptable.c
index ab537cb71822c92c0d99eb70fcc780b92425ff60..b0360bfe08e4528f99e05152e0801e0865ca3670 100644 (file)
--- a/src/mainboard/intel/d945gclf/mptable.c
+++ b/src/mainboard/intel/d945gclf/mptable.c
@@ -32,7 +32,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/intel/eagleheights/mptable.c b/src/mainboard/intel/eagleheights/mptable.c
index 8571864450250b959796cd1ee0b5fcf9bda620a1..809feec9de1a2ac26ded81b077f8a152f1a66407 100644 (file)
--- a/src/mainboard/intel/eagleheights/mptable.c
+++ b/src/mainboard/intel/eagleheights/mptable.c
@@ -78,7 +78,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/intel/jarrell/mptable.c b/src/mainboard/intel/jarrell/mptable.c
index b6657037dc041cee9ada8f4e27803bfbe0747126..6662329178bbb3b1111cfa9fcb70697fa47721c1 100644 (file)
--- a/src/mainboard/intel/jarrell/mptable.c
+++ b/src/mainboard/intel/jarrell/mptable.c
@@ -19,7 +19,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/intel/mtarvon/mptable.c b/src/mainboard/intel/mtarvon/mptable.c
index 0c025f0eedd543ef42329ebc4e9552b02f43f8de..364d0776a4c7d202a491973b42a04ef679010ba3 100644 (file)
--- a/src/mainboard/intel/mtarvon/mptable.c
+++ b/src/mainboard/intel/mtarvon/mptable.c
@@ -35,7 +35,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/intel/truxton/mptable.c b/src/mainboard/intel/truxton/mptable.c
index 506a1d0b550c5fd57a86e1162814bfffe5885d9d..0cc8f6b466dad153f76578b7e7fb25fd6ff34445 100644 (file)
--- a/src/mainboard/intel/truxton/mptable.c
+++ b/src/mainboard/intel/truxton/mptable.c
@@ -35,7 +35,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/intel/xe7501devkit/mptable.c b/src/mainboard/intel/xe7501devkit/mptable.c
index 99fd5af1fed5ee90fe3094b8c01c9ef39e6f2ca1..cc7eda5ddfb9bb13be40a4dd37a19b36c1a7cf53 100644 (file)
--- a/src/mainboard/intel/xe7501devkit/mptable.c
+++ b/src/mainboard/intel/xe7501devkit/mptable.c
@@ -122,7 +122,7 @@ static void *smp_write_config_table(void* v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/iwave/iWRainbowG6/mptable.c b/src/mainboard/iwave/iWRainbowG6/mptable.c
index bf94b8c9e16ec1cb0a92ad5f0f47cb77a37eca7f..953f16aeb2f537b7c670289b9479a885bea9e769 100644 (file)
--- a/src/mainboard/iwave/iWRainbowG6/mptable.c
+++ b/src/mainboard/iwave/iWRainbowG6/mptable.c
@@ -29,7 +29,7 @@ void *smp_write_config_table(void *v)
        int isa_bus;
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
        mptable_write_buses(mc, NULL, &isa_bus);

diff --git a/src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl b/src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl
index 0f7efc9ee9be9c34e4b6b93827868531aae7a801..56c0a1679f051a92bd07a7f5a5e0ef254b25637d 100644 (file)
--- a/src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl
+++ b/src/mainboard/iwill/dk8_htx/acpi/amd8111_isa.asl
@@ -1,3 +1,6 @@
+#include <arch/ioapic.h>
+#include <cpu/x86/lapic_def.h>
+
 /*
  * Copyright 2005 AMD
  */
@@ -125,9 +128,9 @@
                         {
                             Memory32Fixed (ReadWrite, 0x000E0000, 0x00020000) // BIOS E4000-FFFFF
                             Memory32Fixed (ReadWrite, 0x000C0000, 0x00010000) // video BIOS c0000-c8404
-                            Memory32Fixed (ReadWrite, 0xFEC00000, 0x00001000) // I/O APIC
+                            Memory32Fixed (ReadWrite, IO_APIC_ADDR, 0x00001000)
                             Memory32Fixed (ReadWrite, 0xFFC00000, 0x00380000) // LPC forwarded, 4 MB w/ROM
-                            Memory32Fixed (ReadWrite, 0xFEE00000, 0x00001000) // Local APIC
+                            Memory32Fixed (ReadWrite, LOCAL_APIC_ADDR, 0x00001000)
                             Memory32Fixed (ReadWrite, 0xFFF80000, 0x00080000) // Overlay BIOS
                             Memory32Fixed (ReadWrite, 0x00000000, 0x00000000) // Overlay BIOS
                             Memory32Fixed (ReadWrite, 0x00000000, 0x00000000) // Overlay BIOS

diff --git a/src/mainboard/iwill/dk8_htx/mptable.c b/src/mainboard/iwill/dk8_htx/mptable.c
index fd53bd7b999aca9f1ff69a6e97dc0abcb6255d2d..39776730e00efc36fcf7f828adff474d94619d63 100644 (file)
--- a/src/mainboard/iwill/dk8_htx/mptable.c
+++ b/src/mainboard/iwill/dk8_htx/mptable.c
@@ -18,7 +18,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/iwill/dk8s2/mptable.c b/src/mainboard/iwill/dk8s2/mptable.c
index d78ce2076956371fd2fe7479c31ffd4b73058295..f22fd9d669af1994d40db017adedbf46f5fd865e 100644 (file)
--- a/src/mainboard/iwill/dk8s2/mptable.c
+++ b/src/mainboard/iwill/dk8s2/mptable.c
@@ -15,7 +15,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/iwill/dk8x/mptable.c b/src/mainboard/iwill/dk8x/mptable.c
index d78ce2076956371fd2fe7479c31ffd4b73058295..f22fd9d669af1994d40db017adedbf46f5fd865e 100644 (file)
--- a/src/mainboard/iwill/dk8x/mptable.c
+++ b/src/mainboard/iwill/dk8x/mptable.c
@@ -15,7 +15,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/jetway/pa78vm5/mptable.c b/src/mainboard/jetway/pa78vm5/mptable.c
index 11b43574dc1d956d832c81d8313a3a24b029b740..b8caa23ce234badb334d9794677fd42a9ffac50a 100644 (file)
--- a/src/mainboard/jetway/pa78vm5/mptable.c
+++ b/src/mainboard/jetway/pa78vm5/mptable.c
@@ -41,7 +41,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/kontron/986lcd-m/mptable.c b/src/mainboard/kontron/986lcd-m/mptable.c
index ab63b45b3c59bde5b97995299021834ca15dac18..03f737046feac296f87f367563ae063d04548c33 100644 (file)
--- a/src/mainboard/kontron/986lcd-m/mptable.c
+++ b/src/mainboard/kontron/986lcd-m/mptable.c
@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/kontron/kt690/mptable.c b/src/mainboard/kontron/kt690/mptable.c
index 21a0d056e1816288b384820766d42f638da2d919..4ffba6f3101ccd3266093a394cbb96f60dbd880b 100644 (file)
--- a/src/mainboard/kontron/kt690/mptable.c
+++ b/src/mainboard/kontron/kt690/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/lenovo/t60/mptable.c b/src/mainboard/lenovo/t60/mptable.c
index a74aca829acca3dbab8cff3eb5b01edb1af3e759..312e30dde13caed4dee489958ea69a0210cff170 100644 (file)
--- a/src/mainboard/lenovo/t60/mptable.c
+++ b/src/mainboard/lenovo/t60/mptable.c
@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/lenovo/x60/mptable.c b/src/mainboard/lenovo/x60/mptable.c
index 0ce10ed29d354fd4e20b122a0132a8078d80a3a9..f21e76fc4b3b53d7b8d709d95943bed6751c6dd5 100644 (file)
--- a/src/mainboard/lenovo/x60/mptable.c
+++ b/src/mainboard/lenovo/x60/mptable.c
@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/msi/ms7135/mptable.c b/src/mainboard/msi/ms7135/mptable.c
index 4262af1c8609409fd2d1ac51cbdc9820c9c83d5c..7d7ba5312410f17a32e80d7d59aaee6b326093ff 100644 (file)
--- a/src/mainboard/msi/ms7135/mptable.c
+++ b/src/mainboard/msi/ms7135/mptable.c
@@ -43,7 +43,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
        mptable_write_buses(mc, NULL, &bus_isa);

diff --git a/src/mainboard/msi/ms7260/mptable.c b/src/mainboard/msi/ms7260/mptable.c
index bef81ef2c2fbd176e57d87d120fe19d8f1d29000..41f5bf781ecbdaf1e81871d4b105371aa075f9d0 100644 (file)
--- a/src/mainboard/msi/ms7260/mptable.c
+++ b/src/mainboard/msi/ms7260/mptable.c
@@ -37,7 +37,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/msi/ms9185/mptable.c b/src/mainboard/msi/ms9185/mptable.c
index 0f97dcaa4a6a811ec764ed17f3660c91d14a89b0..fe65d7df95f534e04ead9d3e3a7d3edfcbe7b63d 100644 (file)
--- a/src/mainboard/msi/ms9185/mptable.c
+++ b/src/mainboard/msi/ms9185/mptable.c
@@ -45,7 +45,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/msi/ms9282/mptable.c b/src/mainboard/msi/ms9282/mptable.c
index baba6b5c67d492f58dbbd4b3fa96431e8ff55b5b..0559844d3ccfd9c2d688be7e4d59978d192aa19c 100644 (file)
--- a/src/mainboard/msi/ms9282/mptable.c
+++ b/src/mainboard/msi/ms9282/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/msi/ms9652_fam10/mptable.c b/src/mainboard/msi/ms9652_fam10/mptable.c
index 5e453801cb074c2d1f260dcab9e0b8a49ddc5fda..35d1172a59d54bfa8c7c2162406962d8ef1dcd6b 100644 (file)
--- a/src/mainboard/msi/ms9652_fam10/mptable.c
+++ b/src/mainboard/msi/ms9652_fam10/mptable.c
@@ -37,7 +37,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/newisys/khepri/mptable.c b/src/mainboard/newisys/khepri/mptable.c
index 4017fcefb246312864dde9c6e18d21fc23ee8671..8ee6e15e03fda180ad83f571b17b06e8d62e184a 100644 (file)
--- a/src/mainboard/newisys/khepri/mptable.c
+++ b/src/mainboard/newisys/khepri/mptable.c
@@ -15,7 +15,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/nvidia/l1_2pvv/mptable.c b/src/mainboard/nvidia/l1_2pvv/mptable.c
index 5d13701f5a87b8b0e8065c1845bfa3200254255c..b7e1a8837b6ee887c710ce5d938c7cf044d5b32c 100644 (file)
--- a/src/mainboard/nvidia/l1_2pvv/mptable.c
+++ b/src/mainboard/nvidia/l1_2pvv/mptable.c
@@ -37,7 +37,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/roda/rk886ex/mptable.c b/src/mainboard/roda/rk886ex/mptable.c
index 5954c9714f38ec6e2eea19fd3dbca636f8f6e880..9b59bb470edcd7e4c6c10abfbcea60f48b407b3c 100644 (file)
--- a/src/mainboard/roda/rk886ex/mptable.c
+++ b/src/mainboard/roda/rk886ex/mptable.c
@@ -34,7 +34,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/siemens/sitemp_g1p1/dsdt.asl b/src/mainboard/siemens/sitemp_g1p1/dsdt.asl
index 8ad0f82c90747871236c75328bbaac67e74d399f..e03e66562ae192bd228f8e7c020a9a7a2965b1bd 100644 (file)
--- a/src/mainboard/siemens/sitemp_g1p1/dsdt.asl
+++ b/src/mainboard/siemens/sitemp_g1p1/dsdt.asl
@@ -18,6 +18,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
+#include <arch/ioapic.h>
+#include <cpu/x86/lapic_def.h>
 
 DefinitionBlock ("DSDT.aml", "DSDT", 2, "SIEMENS", "SITEMP ", 0x20101005)
 {
@@ -418,8 +420,8 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "SIEMENS", "SITEMP ", 0x20101005)
                     CreateDWordField (MEM1, \_SB.PCI0.MEMR._Y1B._LEN, ML02)
                     If (PCIF)
                     {
-                        Store (0xFEC00000, MB01)
-                        Store (0xFEE00000, MB02)
+                        Store (IO_APIC_ADDR, MB01)
+                        Store (LOCAL_APIC_ADDR, MB02)
                         Store (0x1000, ML01)
                         Store (0x1000, ML02)
                     }

diff --git a/src/mainboard/siemens/sitemp_g1p1/mptable.c b/src/mainboard/siemens/sitemp_g1p1/mptable.c
index ba2c1e4c1c3d4ae39ac031a50676b22b7aced494..dc98382107297e25748565ee83cea63629149550 100644 (file)
--- a/src/mainboard/siemens/sitemp_g1p1/mptable.c
+++ b/src/mainboard/siemens/sitemp_g1p1/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
        int isa_bus;
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
        smp_write_processors(mc);
 
        get_bus_conf();

diff --git a/src/mainboard/sunw/ultra40/mptable.c b/src/mainboard/sunw/ultra40/mptable.c
index c00c4b88e849659f0b88307581d2d2c897693441..1ba1dcf3168fbc4eafe230095ce0bbc2e880434b 100644 (file)
--- a/src/mainboard/sunw/ultra40/mptable.c
+++ b/src/mainboard/sunw/ultra40/mptable.c
@@ -39,7 +39,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/supermicro/h8dme/mptable.c b/src/mainboard/supermicro/h8dme/mptable.c
index cdbe7d644e58afa595665ad9ac3af6e272736e0a..93fea87f59cdd6a72f893da6db1d43282fdec0ba 100644 (file)
--- a/src/mainboard/supermicro/h8dme/mptable.c
+++ b/src/mainboard/supermicro/h8dme/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/supermicro/h8dmr/mptable.c b/src/mainboard/supermicro/h8dmr/mptable.c
index 734fac9d7996ad24ffee3db5fdd4ed5b6298d4e2..f54e18f3b3571ee8646bbda765962e4ffb6a7663 100644 (file)
--- a/src/mainboard/supermicro/h8dmr/mptable.c
+++ b/src/mainboard/supermicro/h8dmr/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/supermicro/h8dmr_fam10/mptable.c b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
index f2ee7a8d4b71ed788853cb1b8b92d697b95bc228..6ed584076876daa51bd2311065f0125a0fe6fd0a 100644 (file)
--- a/src/mainboard/supermicro/h8dmr_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
@@ -36,7 +36,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/supermicro/h8qgi/mptable.c b/src/mainboard/supermicro/h8qgi/mptable.c
index 92771bd829497398e3e1aa67ecaafe40cb658a3a..61a7bd4550c19f80d7cd32495123da8871b6ea56 100644 (file)
--- a/src/mainboard/supermicro/h8qgi/mptable.c
+++ b/src/mainboard/supermicro/h8qgi/mptable.c
@@ -45,7 +45,7 @@ static void *smp_write_config_table(void *v)
        u32 dword;
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
        get_bus_conf();

diff --git a/src/mainboard/supermicro/h8qme_fam10/mptable.c b/src/mainboard/supermicro/h8qme_fam10/mptable.c
index 2e7c4af9291138de1010b02f908736f5539d9641..e6d4280c371f01aac470fcf77c3c688bfba0685e 100644 (file)
--- a/src/mainboard/supermicro/h8qme_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8qme_fam10/mptable.c
@@ -38,7 +38,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/supermicro/h8scm_fam10/mptable.c b/src/mainboard/supermicro/h8scm_fam10/mptable.c
index b2c1c92277834693a0603971984d832d9aae3463..0c75d1a15b58e1328731a0f92b094b0c77889437 100644 (file)
--- a/src/mainboard/supermicro/h8scm_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8scm_fam10/mptable.c
@@ -43,7 +43,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/supermicro/x6dai_g/mptable.c b/src/mainboard/supermicro/x6dai_g/mptable.c
index acd719d75159ce82b38183cc7ebd333dd1b12819..6ba5309157352c395954a40c9fd7a1ea3ddbc564 100644 (file)
--- a/src/mainboard/supermicro/x6dai_g/mptable.c
+++ b/src/mainboard/supermicro/x6dai_g/mptable.c
@@ -13,7 +13,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/supermicro/x6dhe_g/mptable.c b/src/mainboard/supermicro/x6dhe_g/mptable.c
index f5f4100e5c88dea71809e0d982b2177c6398522e..4504d3462709409337ddfda01908d0c3d51f6c41 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g/mptable.c
+++ b/src/mainboard/supermicro/x6dhe_g/mptable.c
@@ -16,7 +16,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/supermicro/x6dhe_g2/mptable.c b/src/mainboard/supermicro/x6dhe_g2/mptable.c
index e39a700ec7afcd0f1c60cdd342cede6538545912..087bb9e53e68cbdcc10e79d7ecd7afd2b44de541 100644 (file)
--- a/src/mainboard/supermicro/x6dhe_g2/mptable.c
+++ b/src/mainboard/supermicro/x6dhe_g2/mptable.c
@@ -16,7 +16,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/supermicro/x6dhr_ig/mptable.c b/src/mainboard/supermicro/x6dhr_ig/mptable.c
index 143138d012c0e0397204441f951780fc1c6bb8bf..5d0a08d323f698aa38723a0e06f3c1a6ded09bb1 100644 (file)
--- a/src/mainboard/supermicro/x6dhr_ig/mptable.c
+++ b/src/mainboard/supermicro/x6dhr_ig/mptable.c
@@ -17,7 +17,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/supermicro/x6dhr_ig2/mptable.c b/src/mainboard/supermicro/x6dhr_ig2/mptable.c
index a374f5c6d7196d9b8fa0ec07af3585e10f000597..b6c94d319d0daf4c364f5efac6d1505fb83cd28f 100644 (file)
--- a/src/mainboard/supermicro/x6dhr_ig2/mptable.c
+++ b/src/mainboard/supermicro/x6dhr_ig2/mptable.c
@@ -17,7 +17,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/technexion/tim5690/mptable.c b/src/mainboard/technexion/tim5690/mptable.c
index 21a0d056e1816288b384820766d42f638da2d919..4ffba6f3101ccd3266093a394cbb96f60dbd880b 100644 (file)
--- a/src/mainboard/technexion/tim5690/mptable.c
+++ b/src/mainboard/technexion/tim5690/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/technexion/tim8690/mptable.c b/src/mainboard/technexion/tim8690/mptable.c
index 21a0d056e1816288b384820766d42f638da2d919..4ffba6f3101ccd3266093a394cbb96f60dbd880b 100644 (file)
--- a/src/mainboard/technexion/tim8690/mptable.c
+++ b/src/mainboard/technexion/tim8690/mptable.c
@@ -40,7 +40,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/tyan/s2735/mptable.c b/src/mainboard/tyan/s2735/mptable.c
index 9612a4c26cf5408a8333c9480c3ca271e0b86985..907372809f55d9bf289452bc82994c7c8eacc62c 100644 (file)
--- a/src/mainboard/tyan/s2735/mptable.c
+++ b/src/mainboard/tyan/s2735/mptable.c
@@ -12,7 +12,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
        mptable_write_buses(mc, NULL, &isa_bus);

diff --git a/src/mainboard/tyan/s2850/mptable.c b/src/mainboard/tyan/s2850/mptable.c
index 5144cec6d2c754fb85a240df2bb8fee5c51ac938..08027f4a721123f3f44e62b8eb249ab35ee4630d 100644 (file)
--- a/src/mainboard/tyan/s2850/mptable.c
+++ b/src/mainboard/tyan/s2850/mptable.c
@@ -53,7 +53,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
         {

diff --git a/src/mainboard/tyan/s2875/mptable.c b/src/mainboard/tyan/s2875/mptable.c
index 67de027e67845e1a5bff63e4f0c833229826ebb0..c3765f2da1c942b6fdfdca1179dcbe7188b3ffa2 100644 (file)
--- a/src/mainboard/tyan/s2875/mptable.c
+++ b/src/mainboard/tyan/s2875/mptable.c
@@ -54,7 +54,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/tyan/s2880/mptable.c b/src/mainboard/tyan/s2880/mptable.c
index e0058fada2d3133ecd90e90450879526599ecf09..2d34c8ba9ddb8594c536bffd31f7d374a9e00485 100644 (file)
--- a/src/mainboard/tyan/s2880/mptable.c
+++ b/src/mainboard/tyan/s2880/mptable.c
@@ -57,7 +57,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/tyan/s2881/mptable.c b/src/mainboard/tyan/s2881/mptable.c
index 80b35bc20ad68a88ead1ae8b1578a1f4e5177f66..7df5e874b45eda898d06dca514442ddb5796b90c 100644 (file)
--- a/src/mainboard/tyan/s2881/mptable.c
+++ b/src/mainboard/tyan/s2881/mptable.c
@@ -24,7 +24,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/tyan/s2882/mptable.c b/src/mainboard/tyan/s2882/mptable.c
index b028abb659fdfe4175261753b635a24a77186f33..47c39a763a1a52c8f316974f802ef7e5028fc9ff 100644 (file)
--- a/src/mainboard/tyan/s2882/mptable.c
+++ b/src/mainboard/tyan/s2882/mptable.c
@@ -58,7 +58,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
         {

diff --git a/src/mainboard/tyan/s2885/mptable.c b/src/mainboard/tyan/s2885/mptable.c
index fc5109f466994e6e45ad345c54b7754ff34b052e..26081c7234bd79bc2a5925550ab1df6af11bbbba 100644 (file)
--- a/src/mainboard/tyan/s2885/mptable.c
+++ b/src/mainboard/tyan/s2885/mptable.c
@@ -27,7 +27,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/tyan/s2891/mptable.c b/src/mainboard/tyan/s2891/mptable.c
index 12d6e785be686f2ba42a162db9d4ee11ec0b69e1..cb49434bf094d64c5510c378b2e9053e969e0d22 100644 (file)
--- a/src/mainboard/tyan/s2891/mptable.c
+++ b/src/mainboard/tyan/s2891/mptable.c
@@ -28,7 +28,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/tyan/s2892/mptable.c b/src/mainboard/tyan/s2892/mptable.c
index 7af319ac6eaea7a6f23364565887e6663ce31f3c..882ac69d26e5b7f2d0cf4a90c5533c86d040666d 100644 (file)
--- a/src/mainboard/tyan/s2892/mptable.c
+++ b/src/mainboard/tyan/s2892/mptable.c
@@ -28,7 +28,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/tyan/s2895/mptable.c b/src/mainboard/tyan/s2895/mptable.c
index a383cb28d2b4dcd63cfd4f4fba4d0913478e6362..20fa92cdfcde0972cb2e0fd25620a5090dae022b 100644 (file)
--- a/src/mainboard/tyan/s2895/mptable.c
+++ b/src/mainboard/tyan/s2895/mptable.c
@@ -36,7 +36,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/tyan/s2912/mptable.c b/src/mainboard/tyan/s2912/mptable.c
index 49720dcba3389bf32166db57296048b00a05f315..9fe7ab7aba01bb6c996b8a9a3df5f7cbd4c823fd 100644 (file)
--- a/src/mainboard/tyan/s2912/mptable.c
+++ b/src/mainboard/tyan/s2912/mptable.c
@@ -36,7 +36,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/tyan/s2912_fam10/mptable.c b/src/mainboard/tyan/s2912_fam10/mptable.c
index 393362b43f1bcff418b0b49d8531fc35ce2c0349..8b5f365fcc249d446a63c9db68c8877c877e9c63 100644 (file)
--- a/src/mainboard/tyan/s2912_fam10/mptable.c
+++ b/src/mainboard/tyan/s2912_fam10/mptable.c
@@ -36,7 +36,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
 

diff --git a/src/mainboard/tyan/s4880/mptable.c b/src/mainboard/tyan/s4880/mptable.c
index 6646718952b474f76a555fcbc1fc2622c79fc085..9111a6377b86d6ef049eadb80693f5df5f9400c4 100644 (file)
--- a/src/mainboard/tyan/s4880/mptable.c
+++ b/src/mainboard/tyan/s4880/mptable.c
@@ -57,7 +57,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/tyan/s4882/mptable.c b/src/mainboard/tyan/s4882/mptable.c
index c1da3e5f45d1acbf2d46820143263a0904f4b55a..bca26a056faa7935ba0d8225a50bb7060cd3a190 100644 (file)
--- a/src/mainboard/tyan/s4882/mptable.c
+++ b/src/mainboard/tyan/s4882/mptable.c
@@ -57,7 +57,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
 

diff --git a/src/mainboard/via/epia-n/mainboard.c b/src/mainboard/via/epia-n/mainboard.c
index 9227f0ab0eace9061ae8a7d81bd4045917e0174e..6e11a0087ae1eface20eff9e4cf85210f2fb3048 100644 (file)
--- a/src/mainboard/via/epia-n/mainboard.c
+++ b/src/mainboard/via/epia-n/mainboard.c
@@ -25,6 +25,7 @@
 #include <boot/tables.h>
 #include <arch/ioapic.h>
 #include <southbridge/via/vt8237r/vt8237r.h>
+#include <cpu/x86/lapic_def.h>
 #include "chip.h"
 
 int add_mainboard_resources(struct lb_memory *mem)
@@ -33,7 +34,7 @@ int add_mainboard_resources(struct lb_memory *mem)
        lb_add_memory_range(mem, LB_MEM_RESERVED,
                IO_APIC_ADDR, 0x1000);
        lb_add_memory_range(mem, LB_MEM_RESERVED,
-               0xFEE00000ULL, 0x1000);
+               LOCAL_APIC_ADDR, 0x1000);
        lb_add_memory_range(mem, LB_MEM_RESERVED,
                0xFFFF0000ULL, 0x10000);
 #endif

diff --git a/src/mainboard/via/epia-n/mptable.c b/src/mainboard/via/epia-n/mptable.c
index c7c554a71e48eabb24329cdfb847aa4c8f8aa8d4..de25d0e54936759b408d1e714029be18f1b2d9b6 100644 (file)
--- a/src/mainboard/via/epia-n/mptable.c
+++ b/src/mainboard/via/epia-n/mptable.c
@@ -14,7 +14,7 @@ static void *smp_write_config_table(void *v)
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
         smp_write_processors(mc);
         mptable_write_buses(mc, NULL, &isa_bus);

diff --git a/src/mainboard/via/pc2500e/mptable.c b/src/mainboard/via/pc2500e/mptable.c
index 939f21d0ca8192b677ff8d20d8bd8c2f9c6edb30..fa69bbeda00ebf032d27d099dd760bb9c6cefea6 100644 (file)
--- a/src/mainboard/via/pc2500e/mptable.c
+++ b/src/mainboard/via/pc2500e/mptable.c
@@ -37,7 +37,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
        mptable_write_buses(mc, NULL, &isa_bus);

diff --git a/src/mainboard/via/vt8454c/mptable.c b/src/mainboard/via/vt8454c/mptable.c
index 575237f6913478df26e590d4db081f9ddea44f04..fc9cb99ef7b9a103aa4d98b0134e37a38898a202 100644 (file)
--- a/src/mainboard/via/vt8454c/mptable.c
+++ b/src/mainboard/via/vt8454c/mptable.c
@@ -35,7 +35,7 @@ static void *smp_write_config_table(void *v)
 
        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
 
-       mptable_init(mc, LAPIC_ADDR);
+       mptable_init(mc, LOCAL_APIC_ADDR);
 
        smp_write_processors(mc);
        mptable_write_buses(mc, NULL, &isa_bus);