This patch cleans up mpspec.h and allows it to be included when

HAVE_MP_TABLE=0

It also removes the artifacts from the Asus m2v-mx_se that were
necessary before the change.

Signed-off-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4120 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/arch/i386/include/arch/smp/mpspec.h b/src/arch/i386/include/arch/smp/mpspec.h
index aa273e0c9b0c33dedf262d61ef2debe5bb271c48..0e8e3553c3124e11006ab67de4a1503c7183ef23 100644 (file)
--- a/src/arch/i386/include/arch/smp/mpspec.h
+++ b/src/arch/i386/include/arch/smp/mpspec.h
@@ -1,8 +1,6 @@
 #ifndef __ASM_MPSPEC_H
 #define __ASM_MPSPEC_H
 
-#if HAVE_MP_TABLE==1
-
 /*
  * Structure definitions for SMP machines following the
  * Intel Multiprocessing Specification 1.1 and 1.4.
@@ -272,16 +270,5 @@ void *smp_write_floating_table_physaddr(unsigned long addr,
                unsigned long mpf_physptr);
 unsigned long write_smp_table(unsigned long addr);
 
-#else /* HAVE_MP_TABLE */
-#if 0
-static inline 
-unsigned long write_smp_table(unsigned long addr)
-{
-       return addr;
-}
-#endif
-#define write_smp_table(addr)  (addr)
-#endif /* HAVE_MP_TABLE */
-
 #endif
 

diff --git a/src/mainboard/asus/m2v-mx_se/Config.lb b/src/mainboard/asus/m2v-mx_se/Config.lb
index e697760c46f56b9f04f4dc230c43fa625a1ea38c..8b8aa67e2f3b29d1450d73f1db775847309fec3b 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/Config.lb
+++ b/src/mainboard/asus/m2v-mx_se/Config.lb
@@ -51,9 +51,6 @@ if HAVE_ACPI_TABLES
   end
   object ./dsdt.o
 end
-if HAVE_MP_TABLE object mptable.o end
-if HAVE_PIRQ_TABLE object irq_tables.o end
-# object reset.o
 
   if CONFIG_USE_INIT
     makerule ./cache_as_ram_auto.o

diff --git a/src/mainboard/asus/m2v-mx_se/Options.lb b/src/mainboard/asus/m2v-mx_se/Options.lb
index f9a88c9beff71555574e48da86b21be90475df58..195b34ee80094bed5bff00fdbd1a542a59dc2895 100644 (file)
--- a/src/mainboard/asus/m2v-mx_se/Options.lb
+++ b/src/mainboard/asus/m2v-mx_se/Options.lb
@@ -103,7 +103,7 @@ default HAVE_FALLBACK_BOOT = 1
 default HAVE_HARD_RESET = 1
 default HAVE_PIRQ_TABLE = 0
 default IRQ_SLOT_COUNT = 11    # FIXME?
-default HAVE_MP_TABLE = 1
+default HAVE_MP_TABLE = 0
 default HAVE_OPTION_TABLE = 0  # FIXME
 # Move the default coreboot CMOS range off of AMD RTC registers.
 default LB_CKS_RANGE_START = 49