[coreboot] [v2] r4367 - in trunk/coreboot-v2/src: config mainboard/a-trend/atc-6220 mainboard/a-trend/atc-6240 mainboard/abit/be6-ii_v2_0 mainboard/advantech/pcm-5820 mainboard/amd/db800 mainboard/amd/norwich mainboard/amd/rumba mainboard/artecgroup/dbe61 mainboard/asi/mb_5blgp mainboard/asi/mb_5blmp mainboard/asus/mew-am mainboard/asus/mew-vm mainboard/asus/p2b mainboard/asus/p2b-d mainboard/asus/p2b-ds mainboard/asus/p2b-f mainboard/asus/p3b-f mainboard/axus/tc320 mainboard/azza/pt-6ibd mainboard/bcom/winnet100 mainboard/bcom/winnetp680 mainboard/biostar/m6tba mainboard/compaq/deskpro_en_sff_p600 mainboard/dell/s1850 mainboard/digitallogic/adl855pc mainboard/digitallogic/msm800sev mainboard/eaglelion/5bcm mainboard/embeddedplanet/ep405pc mainboard/gigabyte/ga-6bxc mainboard/iei/juki-511p mainboard/iei/nova4899r mainboard/iei/pcisa-lx-800-r10 mainboard/intel/jarrell mainboard/intel/mtarvon mainboard/intel/truxton mainboard/intel/xe7501devkit mainboard/jetway/j7f24 mainboard/lippert/frontrunner mainboard/lippert/roadrunner-lx mainboard/lippert/spacerunner-lx mainboard/motorola/sandpoint mainboard/msi/ms6119 mainboard/msi/ms6147 mainboard/msi/ms6178 mainboard/nec/powermate2000 mainboard/olpc/btest mainboard/olpc/rev_a mainboard/pcengines/alix1c mainboard/rca/rm4100 mainboard/supermicro/x6dai_g mainboard/supermicro/x6dhe_g mainboard/supermicro/x6dhe_g2 mainboard/supermicro/x6dhr_ig mainboard/supermicro/x6dhr_ig2 mainboard/televideo/tc7020 mainboard/thomson/ip1000 mainboard/totalimpact/briq mainboard/tyan/s1846 mainboard/via/epia mainboard/via/epia-cn mainboard/via/epia-m mainboard/via/pc2500e mainboard/via/vt8454c pc80

svn at coreboot.org svn at coreboot.org
Fri Jun 19 23:18:14 CEST 2009


Author: myles
Date: 2009-06-19 23:18:14 +0200 (Fri, 19 Jun 2009)
New Revision: 4367

Modified:
   trunk/coreboot-v2/src/config/Options.lb
   trunk/coreboot-v2/src/mainboard/a-trend/atc-6220/Options.lb
   trunk/coreboot-v2/src/mainboard/a-trend/atc-6240/Options.lb
   trunk/coreboot-v2/src/mainboard/abit/be6-ii_v2_0/Options.lb
   trunk/coreboot-v2/src/mainboard/advantech/pcm-5820/Options.lb
   trunk/coreboot-v2/src/mainboard/amd/db800/Options.lb
   trunk/coreboot-v2/src/mainboard/amd/norwich/Options.lb
   trunk/coreboot-v2/src/mainboard/amd/rumba/Options.lb
   trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Options.lb
   trunk/coreboot-v2/src/mainboard/asi/mb_5blgp/Options.lb
   trunk/coreboot-v2/src/mainboard/asi/mb_5blmp/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/mew-am/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/mew-vm/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/p2b-d/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/p2b-ds/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/p2b-f/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/p2b/Options.lb
   trunk/coreboot-v2/src/mainboard/asus/p3b-f/Options.lb
   trunk/coreboot-v2/src/mainboard/axus/tc320/Options.lb
   trunk/coreboot-v2/src/mainboard/azza/pt-6ibd/Options.lb
   trunk/coreboot-v2/src/mainboard/bcom/winnet100/Options.lb
   trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Options.lb
   trunk/coreboot-v2/src/mainboard/biostar/m6tba/Options.lb
   trunk/coreboot-v2/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
   trunk/coreboot-v2/src/mainboard/dell/s1850/Options.lb
   trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Options.lb
   trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Options.lb
   trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Options.lb
   trunk/coreboot-v2/src/mainboard/embeddedplanet/ep405pc/Options.lb
   trunk/coreboot-v2/src/mainboard/gigabyte/ga-6bxc/Options.lb
   trunk/coreboot-v2/src/mainboard/iei/juki-511p/Options.lb
   trunk/coreboot-v2/src/mainboard/iei/nova4899r/Options.lb
   trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
   trunk/coreboot-v2/src/mainboard/intel/jarrell/Options.lb
   trunk/coreboot-v2/src/mainboard/intel/mtarvon/Options.lb
   trunk/coreboot-v2/src/mainboard/intel/truxton/Options.lb
   trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Options.lb
   trunk/coreboot-v2/src/mainboard/jetway/j7f24/Options.lb
   trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Options.lb
   trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Options.lb
   trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Options.lb
   trunk/coreboot-v2/src/mainboard/motorola/sandpoint/Options.lb
   trunk/coreboot-v2/src/mainboard/msi/ms6119/Options.lb
   trunk/coreboot-v2/src/mainboard/msi/ms6147/Options.lb
   trunk/coreboot-v2/src/mainboard/msi/ms6178/Options.lb
   trunk/coreboot-v2/src/mainboard/nec/powermate2000/Options.lb
   trunk/coreboot-v2/src/mainboard/olpc/btest/Options.lb
   trunk/coreboot-v2/src/mainboard/olpc/rev_a/Options.lb
   trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Options.lb
   trunk/coreboot-v2/src/mainboard/rca/rm4100/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Options.lb
   trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Options.lb
   trunk/coreboot-v2/src/mainboard/televideo/tc7020/Options.lb
   trunk/coreboot-v2/src/mainboard/thomson/ip1000/Options.lb
   trunk/coreboot-v2/src/mainboard/totalimpact/briq/Options.lb
   trunk/coreboot-v2/src/mainboard/tyan/s1846/Options.lb
   trunk/coreboot-v2/src/mainboard/via/epia-cn/Options.lb
   trunk/coreboot-v2/src/mainboard/via/epia-m/Options.lb
   trunk/coreboot-v2/src/mainboard/via/epia/Options.lb
   trunk/coreboot-v2/src/mainboard/via/pc2500e/Options.lb
   trunk/coreboot-v2/src/mainboard/via/vt8454c/Options.lb
   trunk/coreboot-v2/src/pc80/Config.lb
Log:
Undo my ugly commit that added uses clauses in lots of places instead of one.
Fix configuration of all boards. (Abuild tested)
Hopefully fix compilation of PPC boards (they've never compiled for me.)

Apologize profusely.

Signed-off-by: Myles Watson <mylesgw at gmail.com>
Acked-by: Myles Watson <mylesgw at gmail.com>


Modified: trunk/coreboot-v2/src/config/Options.lb
===================================================================
--- trunk/coreboot-v2/src/config/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/config/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -56,6 +56,11 @@
 # Architecture options
 ###############################################
 
+define CONFIG_ARCH_X86
+	default 1
+	export always
+	comment "X86 is the default"
+end
 define ARCH
 	default "i386"
 	export always

Modified: trunk/coreboot-v2/src/mainboard/a-trend/atc-6220/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/a-trend/atc-6220/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/a-trend/atc-6220/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/a-trend/atc-6240/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/a-trend/atc-6240/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/a-trend/atc-6240/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/abit/be6-ii_v2_0/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/abit/be6-ii_v2_0/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/abit/be6-ii_v2_0/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/advantech/pcm-5820/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/advantech/pcm-5820/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/advantech/pcm-5820/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/amd/db800/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/db800/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/amd/db800/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/amd/norwich/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/norwich/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/amd/norwich/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/amd/rumba/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/amd/rumba/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/amd/rumba/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/artecgroup/dbe61/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/asi/mb_5blgp/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asi/mb_5blgp/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/asi/mb_5blgp/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/asi/mb_5blmp/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asi/mb_5blmp/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/asi/mb_5blmp/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_PIRQ_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT
 uses HAVE_HARD_RESET

Modified: trunk/coreboot-v2/src/mainboard/asus/mew-am/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/mew-am/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/asus/mew-am/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/asus/mew-vm/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/mew-vm/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/asus/mew-vm/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/asus/p2b/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p2b/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/asus/p2b/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/asus/p2b-d/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p2b-d/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/asus/p2b-d/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/asus/p2b-ds/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p2b-ds/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/asus/p2b-ds/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/asus/p2b-f/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p2b-f/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/asus/p2b-f/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/asus/p3b-f/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/asus/p3b-f/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/asus/p3b-f/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/axus/tc320/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/axus/tc320/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/axus/tc320/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/azza/pt-6ibd/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/azza/pt-6ibd/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/azza/pt-6ibd/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/bcom/winnet100/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/bcom/winnet100/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/bcom/winnet100/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/bcom/winnetp680/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -21,7 +21,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/biostar/m6tba/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/biostar/m6tba/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/biostar/m6tba/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/dell/s1850/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/dell/s1850/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/dell/s1850/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/digitallogic/adl855pc/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/digitallogic/msm800sev/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/eaglelion/5bcm/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/embeddedplanet/ep405pc/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/embeddedplanet/ep405pc/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/embeddedplanet/ep405pc/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -4,6 +4,7 @@
 
 uses PCIC0_CFGADDR 
 uses CONFIG_CBFS
+uses CONFIG_ARCH_X86
 uses PCIC0_CFGDATA 
 uses ISA_IO_BASE 
 uses ISA_MEM_BASE 
@@ -75,6 +76,7 @@
 ## Enable PPC405 instructions
 default CPU_OPT="-mcpu=405"
 #default CPU_OPT=""
+default CONFIG_ARCH_X86=0
 
 ## Use stage 1 initialization code
 default CONFIG_USE_INIT=1

Modified: trunk/coreboot-v2/src/mainboard/gigabyte/ga-6bxc/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/gigabyte/ga-6bxc/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/gigabyte/ga-6bxc/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/iei/juki-511p/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iei/juki-511p/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/iei/juki-511p/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/iei/nova4899r/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iei/nova4899r/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/iei/nova4899r/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/iei/pcisa-lx-800-r10/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/intel/jarrell/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/jarrell/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/intel/jarrell/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/intel/mtarvon/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/mtarvon/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/intel/mtarvon/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -19,7 +19,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/intel/truxton/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/truxton/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/intel/truxton/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -19,7 +19,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/intel/xe7501devkit/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_ACPI_TABLES
 uses HAVE_ACPI_RESUME
 uses HAVE_PIRQ_TABLE

Modified: trunk/coreboot-v2/src/mainboard/jetway/j7f24/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/jetway/j7f24/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/jetway/j7f24/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -21,7 +21,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/lippert/frontrunner/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/lippert/roadrunner-lx/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -22,7 +22,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/lippert/spacerunner-lx/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -22,7 +22,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/motorola/sandpoint/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/motorola/sandpoint/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/motorola/sandpoint/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,5 +1,6 @@
 uses CONFIG_SANDPOINT_ALTIMUS
 uses CONFIG_CBFS
+uses CONFIG_ARCH_X86
 uses CONFIG_SANDPOINT_TALUS
 uses CONFIG_SANDPOINT_UNITY
 uses CONFIG_SANDPOINT_VALIS
@@ -68,6 +69,7 @@
 ## use a cross compiler
 #default CROSS_COMPILE="powerpc-eabi-"
 #default CROSS_COMPILE="ppc_74xx-"
+default CONFIG_ARCH_X86=0
 
 ## Use stage 1 initialization code
 default CONFIG_USE_INIT=1

Modified: trunk/coreboot-v2/src/mainboard/msi/ms6119/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms6119/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/msi/ms6119/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/msi/ms6147/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms6147/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/msi/ms6147/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/msi/ms6178/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/msi/ms6178/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/msi/ms6178/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/nec/powermate2000/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/nec/powermate2000/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/nec/powermate2000/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/olpc/btest/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/olpc/btest/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/olpc/btest/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/olpc/rev_a/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/olpc/rev_a/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/olpc/rev_a/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/pcengines/alix1c/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/rca/rm4100/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/rca/rm4100/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/rca/rm4100/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses CC
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses CONFIG_CONSOLE_SERIAL8250
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_COMPRESSED_PAYLOAD_LZMA

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dai_g/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhe_g2/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/supermicro/x6dhr_ig2/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/televideo/tc7020/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/televideo/tc7020/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/televideo/tc7020/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/thomson/ip1000/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/thomson/ip1000/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/thomson/ip1000/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses CC
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses CONFIG_CONSOLE_SERIAL8250
 uses CONFIG_CONSOLE_VGA
 uses CONFIG_COMPRESSED_PAYLOAD_LZMA

Modified: trunk/coreboot-v2/src/mainboard/totalimpact/briq/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/totalimpact/briq/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/totalimpact/briq/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -4,6 +4,7 @@
 
 uses TTYS0_DIV
 uses CONFIG_CBFS
+uses CONFIG_ARCH_X86
 uses TTYS0_BASE
 uses CONFIG_BRIQ_750FX
 uses CONFIG_BRIQ_7400
@@ -72,6 +73,7 @@
 ## use a cross compiler
 #default CROSS_COMPILE="powerpc-eabi-"
 #default CROSS_COMPILE="ppc_74xx-"
+default CONFIG_ARCH_X86=0
 
 ## Use stage 1 initialization code
 default CONFIG_USE_INIT=1

Modified: trunk/coreboot-v2/src/mainboard/tyan/s1846/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s1846/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/tyan/s1846/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/via/epia/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/via/epia/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses MAXIMUM_CONSOLE_LOGLEVEL
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses DEFAULT_CONSOLE_LOGLEVEL
 uses CONFIG_CONSOLE_SERIAL8250
 uses TTYS0_BAUD

Modified: trunk/coreboot-v2/src/mainboard/via/epia-cn/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-cn/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/via/epia-cn/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -21,7 +21,6 @@
 
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/via/epia-m/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/epia-m/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/via/epia-m/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,6 +1,5 @@
 uses HAVE_MP_TABLE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE
 uses HAVE_FALLBACK_BOOT

Modified: trunk/coreboot-v2/src/mainboard/via/pc2500e/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/pc2500e/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/via/pc2500e/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -20,7 +20,6 @@
 
 uses CONFIG_SMP
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 uses HAVE_MP_TABLE
 uses HAVE_PIRQ_TABLE
 uses USE_FALLBACK_IMAGE

Modified: trunk/coreboot-v2/src/mainboard/via/vt8454c/Options.lb
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/vt8454c/Options.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/mainboard/via/vt8454c/Options.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -56,7 +56,6 @@
 uses XIP_ROM_SIZE
 uses XIP_ROM_BASE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 
 # compiler specifics
 uses CROSS_COMPILE

Modified: trunk/coreboot-v2/src/pc80/Config.lb
===================================================================
--- trunk/coreboot-v2/src/pc80/Config.lb	2009-06-19 19:50:58 UTC (rev 4366)
+++ trunk/coreboot-v2/src/pc80/Config.lb	2009-06-19 21:18:14 UTC (rev 4367)
@@ -1,5 +1,7 @@
 uses CONFIG_IDE
 uses CONFIG_UDELAY_IO
+uses CONFIG_USE_INIT
+uses CONFIG_ARCH_X86
 
 object mc146818rtc.o
 object isa-dma.o
@@ -18,13 +20,8 @@
 
 object keyboard.o
 
-if CONFIG_CONSOLE_SERIAL8250
+if CONFIG_ARCH_X86
 	if CONFIG_USE_INIT
-		# We should check whether we're on x86, but our
-		# config tool has a problem with that. So we check
-		# for a flag that is only used when we want this symbol:
-		if USE_DCACHE_RAM
-			initobject serial.o
-		end
+		initobject serial.o
 	end
 end





More information about the coreboot mailing list