summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/config/Options.lb5
-rw-r--r--src/mainboard/a-trend/atc-6220/Options.lb1
-rw-r--r--src/mainboard/a-trend/atc-6240/Options.lb1
-rw-r--r--src/mainboard/abit/be6-ii_v2_0/Options.lb1
-rw-r--r--src/mainboard/advantech/pcm-5820/Options.lb1
-rw-r--r--src/mainboard/amd/db800/Options.lb1
-rw-r--r--src/mainboard/amd/norwich/Options.lb1
-rw-r--r--src/mainboard/amd/rumba/Options.lb1
-rw-r--r--src/mainboard/artecgroup/dbe61/Options.lb1
-rw-r--r--src/mainboard/asi/mb_5blgp/Options.lb1
-rw-r--r--src/mainboard/asi/mb_5blmp/Options.lb1
-rw-r--r--src/mainboard/asus/mew-am/Options.lb1
-rw-r--r--src/mainboard/asus/mew-vm/Options.lb1
-rw-r--r--src/mainboard/asus/p2b-d/Options.lb1
-rw-r--r--src/mainboard/asus/p2b-ds/Options.lb1
-rw-r--r--src/mainboard/asus/p2b-f/Options.lb1
-rw-r--r--src/mainboard/asus/p2b/Options.lb1
-rw-r--r--src/mainboard/asus/p3b-f/Options.lb1
-rw-r--r--src/mainboard/axus/tc320/Options.lb1
-rw-r--r--src/mainboard/azza/pt-6ibd/Options.lb1
-rw-r--r--src/mainboard/bcom/winnet100/Options.lb1
-rw-r--r--src/mainboard/bcom/winnetp680/Options.lb1
-rw-r--r--src/mainboard/biostar/m6tba/Options.lb1
-rw-r--r--src/mainboard/compaq/deskpro_en_sff_p600/Options.lb1
-rw-r--r--src/mainboard/dell/s1850/Options.lb1
-rw-r--r--src/mainboard/digitallogic/adl855pc/Options.lb1
-rw-r--r--src/mainboard/digitallogic/msm800sev/Options.lb1
-rw-r--r--src/mainboard/eaglelion/5bcm/Options.lb1
-rw-r--r--src/mainboard/embeddedplanet/ep405pc/Options.lb2
-rw-r--r--src/mainboard/gigabyte/ga-6bxc/Options.lb1
-rw-r--r--src/mainboard/iei/juki-511p/Options.lb1
-rw-r--r--src/mainboard/iei/nova4899r/Options.lb1
-rw-r--r--src/mainboard/iei/pcisa-lx-800-r10/Options.lb1
-rw-r--r--src/mainboard/intel/jarrell/Options.lb1
-rw-r--r--src/mainboard/intel/mtarvon/Options.lb1
-rw-r--r--src/mainboard/intel/truxton/Options.lb1
-rw-r--r--src/mainboard/intel/xe7501devkit/Options.lb1
-rw-r--r--src/mainboard/jetway/j7f24/Options.lb1
-rw-r--r--src/mainboard/lippert/frontrunner/Options.lb1
-rw-r--r--src/mainboard/lippert/roadrunner-lx/Options.lb1
-rw-r--r--src/mainboard/lippert/spacerunner-lx/Options.lb1
-rw-r--r--src/mainboard/motorola/sandpoint/Options.lb2
-rw-r--r--src/mainboard/msi/ms6119/Options.lb1
-rw-r--r--src/mainboard/msi/ms6147/Options.lb1
-rw-r--r--src/mainboard/msi/ms6178/Options.lb1
-rw-r--r--src/mainboard/nec/powermate2000/Options.lb1
-rw-r--r--src/mainboard/olpc/btest/Options.lb1
-rw-r--r--src/mainboard/olpc/rev_a/Options.lb1
-rw-r--r--src/mainboard/pcengines/alix1c/Options.lb1
-rw-r--r--src/mainboard/rca/rm4100/Options.lb1
-rw-r--r--src/mainboard/supermicro/x6dai_g/Options.lb1
-rw-r--r--src/mainboard/supermicro/x6dhe_g/Options.lb1
-rw-r--r--src/mainboard/supermicro/x6dhe_g2/Options.lb1
-rw-r--r--src/mainboard/supermicro/x6dhr_ig/Options.lb1
-rw-r--r--src/mainboard/supermicro/x6dhr_ig2/Options.lb1
-rw-r--r--src/mainboard/televideo/tc7020/Options.lb1
-rw-r--r--src/mainboard/thomson/ip1000/Options.lb1
-rw-r--r--src/mainboard/totalimpact/briq/Options.lb2
-rw-r--r--src/mainboard/tyan/s1846/Options.lb1
-rw-r--r--src/mainboard/via/epia-cn/Options.lb1
-rw-r--r--src/mainboard/via/epia-m/Options.lb1
-rw-r--r--src/mainboard/via/epia/Options.lb1
-rw-r--r--src/mainboard/via/pc2500e/Options.lb1
-rw-r--r--src/mainboard/via/vt8454c/Options.lb1
-rw-r--r--src/pc80/Config.lb11
65 files changed, 15 insertions, 67 deletions
diff --git a/src/config/Options.lb b/src/config/Options.lb
index d0c76600ee..a6524ede03 100644
--- a/src/config/Options.lb
+++ b/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
diff --git a/src/mainboard/a-trend/atc-6220/Options.lb b/src/mainboard/a-trend/atc-6220/Options.lb
index 8ffb2828ae..2641e766df 100644
--- a/src/mainboard/a-trend/atc-6220/Options.lb
+++ b/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
diff --git a/src/mainboard/a-trend/atc-6240/Options.lb b/src/mainboard/a-trend/atc-6240/Options.lb
index edc4aa3017..31c70358f5 100644
--- a/src/mainboard/a-trend/atc-6240/Options.lb
+++ b/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
diff --git a/src/mainboard/abit/be6-ii_v2_0/Options.lb b/src/mainboard/abit/be6-ii_v2_0/Options.lb
index fea21baff2..986b770bbc 100644
--- a/src/mainboard/abit/be6-ii_v2_0/Options.lb
+++ b/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
diff --git a/src/mainboard/advantech/pcm-5820/Options.lb b/src/mainboard/advantech/pcm-5820/Options.lb
index 3adc90378e..8e8d078aaa 100644
--- a/src/mainboard/advantech/pcm-5820/Options.lb
+++ b/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
diff --git a/src/mainboard/amd/db800/Options.lb b/src/mainboard/amd/db800/Options.lb
index 66ff1d592f..33d1d15295 100644
--- a/src/mainboard/amd/db800/Options.lb
+++ b/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
diff --git a/src/mainboard/amd/norwich/Options.lb b/src/mainboard/amd/norwich/Options.lb
index 1b6468728b..634f848c5f 100644
--- a/src/mainboard/amd/norwich/Options.lb
+++ b/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
diff --git a/src/mainboard/amd/rumba/Options.lb b/src/mainboard/amd/rumba/Options.lb
index ec1a63c187..70c05bfa56 100644
--- a/src/mainboard/amd/rumba/Options.lb
+++ b/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
diff --git a/src/mainboard/artecgroup/dbe61/Options.lb b/src/mainboard/artecgroup/dbe61/Options.lb
index e7a91f9718..8ac10de49e 100644
--- a/src/mainboard/artecgroup/dbe61/Options.lb
+++ b/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
diff --git a/src/mainboard/asi/mb_5blgp/Options.lb b/src/mainboard/asi/mb_5blgp/Options.lb
index 0dc7618dda..870f3b80f9 100644
--- a/src/mainboard/asi/mb_5blgp/Options.lb
+++ b/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
diff --git a/src/mainboard/asi/mb_5blmp/Options.lb b/src/mainboard/asi/mb_5blmp/Options.lb
index f1e67ae822..c1ea8c4e24 100644
--- a/src/mainboard/asi/mb_5blmp/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/mew-am/Options.lb b/src/mainboard/asus/mew-am/Options.lb
index 6900d3dd5c..95be45a13d 100644
--- a/src/mainboard/asus/mew-am/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/mew-vm/Options.lb b/src/mainboard/asus/mew-vm/Options.lb
index 7ecf3100f6..fa0eedc074 100644
--- a/src/mainboard/asus/mew-vm/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/p2b-d/Options.lb b/src/mainboard/asus/p2b-d/Options.lb
index 2a076b5514..946cc8a017 100644
--- a/src/mainboard/asus/p2b-d/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/p2b-ds/Options.lb b/src/mainboard/asus/p2b-ds/Options.lb
index 315db06c81..f907eac3d8 100644
--- a/src/mainboard/asus/p2b-ds/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/p2b-f/Options.lb b/src/mainboard/asus/p2b-f/Options.lb
index 8ffb2828ae..2641e766df 100644
--- a/src/mainboard/asus/p2b-f/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/p2b/Options.lb b/src/mainboard/asus/p2b/Options.lb
index 3112bc1826..e6bd850cbd 100644
--- a/src/mainboard/asus/p2b/Options.lb
+++ b/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
diff --git a/src/mainboard/asus/p3b-f/Options.lb b/src/mainboard/asus/p3b-f/Options.lb
index 8ffb2828ae..2641e766df 100644
--- a/src/mainboard/asus/p3b-f/Options.lb
+++ b/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
diff --git a/src/mainboard/axus/tc320/Options.lb b/src/mainboard/axus/tc320/Options.lb
index 11d13e5aa0..0003852a59 100644
--- a/src/mainboard/axus/tc320/Options.lb
+++ b/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
diff --git a/src/mainboard/azza/pt-6ibd/Options.lb b/src/mainboard/azza/pt-6ibd/Options.lb
index 8ffb2828ae..2641e766df 100644
--- a/src/mainboard/azza/pt-6ibd/Options.lb
+++ b/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
diff --git a/src/mainboard/bcom/winnet100/Options.lb b/src/mainboard/bcom/winnet100/Options.lb
index 795f3c2424..384d78ce0a 100644
--- a/src/mainboard/bcom/winnet100/Options.lb
+++ b/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
diff --git a/src/mainboard/bcom/winnetp680/Options.lb b/src/mainboard/bcom/winnetp680/Options.lb
index 1672554a49..446cf228b5 100644
--- a/src/mainboard/bcom/winnetp680/Options.lb
+++ b/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
diff --git a/src/mainboard/biostar/m6tba/Options.lb b/src/mainboard/biostar/m6tba/Options.lb
index 8ffb2828ae..2641e766df 100644
--- a/src/mainboard/biostar/m6tba/Options.lb
+++ b/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
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb b/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
index 8ffb2828ae..2641e766df 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/Options.lb
+++ b/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
diff --git a/src/mainboard/dell/s1850/Options.lb b/src/mainboard/dell/s1850/Options.lb
index 72436a5447..808fe21018 100644
--- a/src/mainboard/dell/s1850/Options.lb
+++ b/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
diff --git a/src/mainboard/digitallogic/adl855pc/Options.lb b/src/mainboard/digitallogic/adl855pc/Options.lb
index 22055a19b4..24cb38cbd8 100644
--- a/src/mainboard/digitallogic/adl855pc/Options.lb
+++ b/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
diff --git a/src/mainboard/digitallogic/msm800sev/Options.lb b/src/mainboard/digitallogic/msm800sev/Options.lb
index 964d85cd48..3eede13583 100644
--- a/src/mainboard/digitallogic/msm800sev/Options.lb
+++ b/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
diff --git a/src/mainboard/eaglelion/5bcm/Options.lb b/src/mainboard/eaglelion/5bcm/Options.lb
index 2425917113..6c4034120f 100644
--- a/src/mainboard/eaglelion/5bcm/Options.lb
+++ b/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
diff --git a/src/mainboard/embeddedplanet/ep405pc/Options.lb b/src/mainboard/embeddedplanet/ep405pc/Options.lb
index 11491508d2..7aabc4f252 100644
--- a/src/mainboard/embeddedplanet/ep405pc/Options.lb
+++ b/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
diff --git a/src/mainboard/gigabyte/ga-6bxc/Options.lb b/src/mainboard/gigabyte/ga-6bxc/Options.lb
index 8ffb2828ae..2641e766df 100644
--- a/src/mainboard/gigabyte/ga-6bxc/Options.lb
+++ b/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
diff --git a/src/mainboard/iei/juki-511p/Options.lb b/src/mainboard/iei/juki-511p/Options.lb
index b1a1d6fd62..2e91257805 100644
--- a/src/mainboard/iei/juki-511p/Options.lb
+++ b/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
diff --git a/src/mainboard/iei/nova4899r/Options.lb b/src/mainboard/iei/nova4899r/Options.lb
index 90d701d4fc..3b49675b70 100644
--- a/src/mainboard/iei/nova4899r/Options.lb
+++ b/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
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Options.lb b/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
index c469721843..a3034b0a45 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/Options.lb
+++ b/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
diff --git a/src/mainboard/intel/jarrell/Options.lb b/src/mainboard/intel/jarrell/Options.lb
index 1b117a5463..a0e1f9ecf6 100644
--- a/src/mainboard/intel/jarrell/Options.lb
+++ b/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
diff --git a/src/mainboard/intel/mtarvon/Options.lb b/src/mainboard/intel/mtarvon/Options.lb
index cf9619052d..47e7ff05f8 100644
--- a/src/mainboard/intel/mtarvon/Options.lb
+++ b/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
diff --git a/src/mainboard/intel/truxton/Options.lb b/src/mainboard/intel/truxton/Options.lb
index 063989f019..d4c777c4e2 100644
--- a/src/mainboard/intel/truxton/Options.lb
+++ b/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
diff --git a/src/mainboard/intel/xe7501devkit/Options.lb b/src/mainboard/intel/xe7501devkit/Options.lb
index 18ed54fedf..d3036df6a7 100644
--- a/src/mainboard/intel/xe7501devkit/Options.lb
+++ b/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
diff --git a/src/mainboard/jetway/j7f24/Options.lb b/src/mainboard/jetway/j7f24/Options.lb
index 599f44c15c..1000212827 100644
--- a/src/mainboard/jetway/j7f24/Options.lb
+++ b/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
diff --git a/src/mainboard/lippert/frontrunner/Options.lb b/src/mainboard/lippert/frontrunner/Options.lb
index ec1a63c187..70c05bfa56 100644
--- a/src/mainboard/lippert/frontrunner/Options.lb
+++ b/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
diff --git a/src/mainboard/lippert/roadrunner-lx/Options.lb b/src/mainboard/lippert/roadrunner-lx/Options.lb
index 9342077426..d91f602534 100644
--- a/src/mainboard/lippert/roadrunner-lx/Options.lb
+++ b/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
diff --git a/src/mainboard/lippert/spacerunner-lx/Options.lb b/src/mainboard/lippert/spacerunner-lx/Options.lb
index dc8565dace..5d8dd0981a 100644
--- a/src/mainboard/lippert/spacerunner-lx/Options.lb
+++ b/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
diff --git a/src/mainboard/motorola/sandpoint/Options.lb b/src/mainboard/motorola/sandpoint/Options.lb
index e6042f1604..239ebc4a08 100644
--- a/src/mainboard/motorola/sandpoint/Options.lb
+++ b/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
diff --git a/src/mainboard/msi/ms6119/Options.lb b/src/mainboard/msi/ms6119/Options.lb
index edc4aa3017..31c70358f5 100644
--- a/src/mainboard/msi/ms6119/Options.lb
+++ b/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
diff --git a/src/mainboard/msi/ms6147/Options.lb b/src/mainboard/msi/ms6147/Options.lb
index d5307f8c28..9e0f7225dd 100644
--- a/src/mainboard/msi/ms6147/Options.lb
+++ b/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
diff --git a/src/mainboard/msi/ms6178/Options.lb b/src/mainboard/msi/ms6178/Options.lb
index 8ccd8683e1..6e2277654b 100644
--- a/src/mainboard/msi/ms6178/Options.lb
+++ b/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
diff --git a/src/mainboard/nec/powermate2000/Options.lb b/src/mainboard/nec/powermate2000/Options.lb
index 59f9a1b015..3985c3c067 100644
--- a/src/mainboard/nec/powermate2000/Options.lb
+++ b/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
diff --git a/src/mainboard/olpc/btest/Options.lb b/src/mainboard/olpc/btest/Options.lb
index 9bc7909875..70ee04683c 100644
--- a/src/mainboard/olpc/btest/Options.lb
+++ b/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
diff --git a/src/mainboard/olpc/rev_a/Options.lb b/src/mainboard/olpc/rev_a/Options.lb
index 9bc7909875..70ee04683c 100644
--- a/src/mainboard/olpc/rev_a/Options.lb
+++ b/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
diff --git a/src/mainboard/pcengines/alix1c/Options.lb b/src/mainboard/pcengines/alix1c/Options.lb
index c09be2d7e5..ea9f3b3a94 100644
--- a/src/mainboard/pcengines/alix1c/Options.lb
+++ b/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
diff --git a/src/mainboard/rca/rm4100/Options.lb b/src/mainboard/rca/rm4100/Options.lb
index 6992e3c476..671114b71a 100644
--- a/src/mainboard/rca/rm4100/Options.lb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dai_g/Options.lb b/src/mainboard/supermicro/x6dai_g/Options.lb
index 901473062a..576cdb8c3e 100644
--- a/src/mainboard/supermicro/x6dai_g/Options.lb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dhe_g/Options.lb b/src/mainboard/supermicro/x6dhe_g/Options.lb
index 5b3ea1ea97..bd31e7c14c 100644
--- a/src/mainboard/supermicro/x6dhe_g/Options.lb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dhe_g2/Options.lb b/src/mainboard/supermicro/x6dhe_g2/Options.lb
index 5b3ea1ea97..bd31e7c14c 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Options.lb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dhr_ig/Options.lb b/src/mainboard/supermicro/x6dhr_ig/Options.lb
index 72436a5447..808fe21018 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Options.lb
+++ b/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
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Options.lb b/src/mainboard/supermicro/x6dhr_ig2/Options.lb
index 72436a5447..808fe21018 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Options.lb
+++ b/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
diff --git a/src/mainboard/televideo/tc7020/Options.lb b/src/mainboard/televideo/tc7020/Options.lb
index b23038f6a9..f215c5a622 100644
--- a/src/mainboard/televideo/tc7020/Options.lb
+++ b/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
diff --git a/src/mainboard/thomson/ip1000/Options.lb b/src/mainboard/thomson/ip1000/Options.lb
index 2eba5730a2..2efa484bbf 100644
--- a/src/mainboard/thomson/ip1000/Options.lb
+++ b/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
diff --git a/src/mainboard/totalimpact/briq/Options.lb b/src/mainboard/totalimpact/briq/Options.lb
index 1a25c9cfa1..3a06b57be5 100644
--- a/src/mainboard/totalimpact/briq/Options.lb
+++ b/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
diff --git a/src/mainboard/tyan/s1846/Options.lb b/src/mainboard/tyan/s1846/Options.lb
index 4701c579ec..e5ebc85be6 100644
--- a/src/mainboard/tyan/s1846/Options.lb
+++ b/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
diff --git a/src/mainboard/via/epia-cn/Options.lb b/src/mainboard/via/epia-cn/Options.lb
index 57487dd931..77ec483dd7 100644
--- a/src/mainboard/via/epia-cn/Options.lb
+++ b/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
diff --git a/src/mainboard/via/epia-m/Options.lb b/src/mainboard/via/epia-m/Options.lb
index ea5eee31ed..5781156c49 100644
--- a/src/mainboard/via/epia-m/Options.lb
+++ b/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
diff --git a/src/mainboard/via/epia/Options.lb b/src/mainboard/via/epia/Options.lb
index 5d46e7a49d..6e4856c543 100644
--- a/src/mainboard/via/epia/Options.lb
+++ b/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
diff --git a/src/mainboard/via/pc2500e/Options.lb b/src/mainboard/via/pc2500e/Options.lb
index a66ac5f0a0..c19f2cd529 100644
--- a/src/mainboard/via/pc2500e/Options.lb
+++ b/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
diff --git a/src/mainboard/via/vt8454c/Options.lb b/src/mainboard/via/vt8454c/Options.lb
index e85b302502..3f1bdb768b 100644
--- a/src/mainboard/via/vt8454c/Options.lb
+++ b/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
diff --git a/src/pc80/Config.lb b/src/pc80/Config.lb
index c946f8b036..3b9bc5b963 100644
--- a/src/pc80/Config.lb
+++ b/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
- # 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