[coreboot] [v2] r4120 - in trunk/coreboot-v2/src: arch/i386/include/arch/smp mainboard/asus/m2v-mx_se

[svn at coreboot.org]

Author: myles
Date: 2009-04-15 23:25:21 +0200 (Wed, 15 Apr 2009)
New Revision: 4120

Modified:
   trunk/coreboot-v2/src/arch/i386/include/arch/smp/mpspec.h
   trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Config.lb
   trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Options.lb
Log:
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 at gmail.com>
Acked-by: Peter Stuge <peter at stuge.se>




Modified: trunk/coreboot-v2/src/arch/i386/include/arch/smp/mpspec.h
===================================================================
--- trunk/coreboot-v2/src/arch/i386/include/arch/smp/mpspec.h	2009-04-15 16:07:27 UTC (rev 4119)
+++ trunk/coreboot-v2/src/arch/i386/include/arch/smp/mpspec.h	2009-04-15 21:25:21 UTC (rev 4120)
@@ -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 @@
 		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
-

Modified: trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Config.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Config.lb	2009-04-15 16:07:27 UTC (rev 4119)
+++ trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Config.lb	2009-04-15 21:25:21 UTC (rev 4120)
@@ -51,9 +51,6 @@
   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

Modified: trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Options.lb	2009-04-15 16:07:27 UTC (rev 4119)
+++ trunk/coreboot-v2/src/mainboard/asus/m2v-mx_se/Options.lb	2009-04-15 21:25:21 UTC (rev 4120)
@@ -103,7 +103,7 @@
 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