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@gmail.com>
Acked-by: Myles Watson <mylesgw@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4367 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

src/config/Options.lb

@@ -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

src/mainboard/a-trend/atc-6220/Options.lb

@@ -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

src/mainboard/a-trend/atc-6240/Options.lb

@@ -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

src/mainboard/abit/be6-ii_v2_0/Options.lb

@@ -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

src/mainboard/advantech/pcm-5820/Options.lb

@@ -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

src/mainboard/amd/db800/Options.lb

@@ -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

src/mainboard/amd/norwich/Options.lb

@@ -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

src/mainboard/amd/rumba/Options.lb

@@ -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

src/mainboard/artecgroup/dbe61/Options.lb

@@ -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

src/mainboard/asi/mb_5blgp/Options.lb

@@ -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

src/mainboard/asi/mb_5blmp/Options.lb

@@ -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

src/mainboard/asus/mew-am/Options.lb

@@ -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

src/mainboard/asus/mew-vm/Options.lb

@@ -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

src/mainboard/asus/p2b-d/Options.lb

@@ -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

src/mainboard/asus/p2b-ds/Options.lb

@@ -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

src/mainboard/asus/p2b-f/Options.lb

@@ -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

src/mainboard/asus/p2b/Options.lb

@@ -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

src/mainboard/asus/p3b-f/Options.lb

@@ -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

src/mainboard/axus/tc320/Options.lb

@@ -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

src/mainboard/azza/pt-6ibd/Options.lb

@@ -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

src/mainboard/bcom/winnet100/Options.lb

@@ -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

src/mainboard/bcom/winnetp680/Options.lb

@@ -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

src/mainboard/biostar/m6tba/Options.lb

@@ -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

src/mainboard/compaq/deskpro_en_sff_p600/Options.lb

@@ -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

src/mainboard/dell/s1850/Options.lb

@@ -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

src/mainboard/digitallogic/adl855pc/Options.lb

@@ -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

src/mainboard/digitallogic/msm800sev/Options.lb

@@ -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

src/mainboard/eaglelion/5bcm/Options.lb

@@ -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

src/mainboard/embeddedplanet/ep405pc/Options.lb

@@ -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 @@ default TTYS0_BASE=0xef600300-ISA_IO_BASE
 ## 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

src/mainboard/gigabyte/ga-6bxc/Options.lb

@@ -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

src/mainboard/iei/juki-511p/Options.lb

@@ -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

src/mainboard/iei/nova4899r/Options.lb

@@ -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

src/mainboard/iei/pcisa-lx-800-r10/Options.lb

@@ -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

src/mainboard/intel/jarrell/Options.lb

@@ -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

src/mainboard/intel/mtarvon/Options.lb

@@ -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

src/mainboard/intel/truxton/Options.lb

@@ -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

src/mainboard/intel/xe7501devkit/Options.lb

@@ -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

src/mainboard/jetway/j7f24/Options.lb

@@ -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

src/mainboard/lippert/frontrunner/Options.lb

@@ -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

src/mainboard/lippert/roadrunner-lx/Options.lb

@@ -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

src/mainboard/lippert/spacerunner-lx/Options.lb

@@ -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

src/mainboard/motorola/sandpoint/Options.lb

@@ -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 @@ default HOSTCC="gcc"
 ## 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

src/mainboard/msi/ms6119/Options.lb

@@ -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

src/mainboard/msi/ms6147/Options.lb

@@ -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

src/mainboard/msi/ms6178/Options.lb

@@ -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

src/mainboard/nec/powermate2000/Options.lb

@@ -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

src/mainboard/olpc/btest/Options.lb

@@ -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

src/mainboard/olpc/rev_a/Options.lb

@@ -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

src/mainboard/pcengines/alix1c/Options.lb

@@ -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

src/mainboard/rca/rm4100/Options.lb

@@ -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

src/mainboard/supermicro/x6dai_g/Options.lb

@@ -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

src/mainboard/supermicro/x6dhe_g/Options.lb

@@ -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

src/mainboard/supermicro/x6dhe_g2/Options.lb

@@ -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

src/mainboard/supermicro/x6dhr_ig/Options.lb

@@ -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

src/mainboard/supermicro/x6dhr_ig2/Options.lb

@@ -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

src/mainboard/televideo/tc7020/Options.lb

@@ -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

src/mainboard/thomson/ip1000/Options.lb

@@ -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

src/mainboard/totalimpact/briq/Options.lb

@@ -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 @@ default HOSTCC="gcc"
 ## 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

src/mainboard/tyan/s1846/Options.lb

@@ -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

src/mainboard/via/epia-cn/Options.lb

@@ -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

src/mainboard/via/epia-m/Options.lb

@@ -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

src/mainboard/via/epia/Options.lb

@@ -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

src/mainboard/via/pc2500e/Options.lb

@@ -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

src/mainboard/via/vt8454c/Options.lb

@@ -56,7 +56,6 @@ uses _RAMBASE
 uses XIP_ROM_SIZE
 uses XIP_ROM_BASE
 uses CONFIG_CBFS
-uses CONFIG_USE_INIT
 
 # compiler specifics
 uses CROSS_COMPILE

src/pc80/Config.lb

@@ -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 @@ dir vga
 
 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
+		initobject serial.o
-		# 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
 	end
 end