Patch set updated for coreboot: 1660b68 Move ARCH_* from board/Kconfig to cpu or soc Kconfig.

[Furquan Shaikh]

Furquan Shaikh ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5570

-gerrit

commit 1660b68c6b39bf97cf01c90965018e4e45f87f1d
Author: Furquan Shaikh 
Date:   Tue Apr 22 15:16:54 2014 -0700

Move ARCH_* from board/Kconfig to cpu or soc Kconfig.

CONFIG_ARCH is a property of the cpu or soc rather than a property of the
    board. Hence, move ARCH_* from every single board to respective cpu or soc
    Kconfigs. Also update abuild to ignore ARCH_ from mainboards.

Change-Id: I6ec1206de5a20601c32d001a384a47f46e6ce479
    Signed-off-by: Furquan Shaikh 
---
 src/cpu/Kconfig                                   |  7 +--
 src/cpu/allwinner/a10/Kconfig                     |  1 +
 src/cpu/amd/agesa/Kconfig                         |  1 +
 src/cpu/amd/geode_gx1/Kconfig                     |  1 +
 src/cpu/amd/geode_gx2/Kconfig                     |  1 +
 src/cpu/amd/geode_lx/Kconfig                      |  1 +
 src/cpu/amd/model_10xxx/Kconfig                   |  1 +
 src/cpu/amd/model_fxx/Kconfig                     |  1 +
 src/cpu/amd/sc520/Kconfig                         |  1 +
 src/cpu/armltd/cortex-a9/Kconfig                  |  2 +-
 src/cpu/dmp/vortex86ex/Kconfig                    |  1 +
 src/cpu/intel/ep80579/Kconfig                     |  1 +
 src/cpu/intel/fsp_model_206ax/Kconfig             |  1 +
 src/cpu/intel/haswell/Kconfig                     |  1 +
 src/cpu/intel/model_1067x/Kconfig                 |  1 +
 src/cpu/intel/model_106cx/Kconfig                 |  1 +
 src/cpu/intel/model_2065x/Kconfig                 |  1 +
 src/cpu/intel/model_206ax/Kconfig                 |  1 +
 src/cpu/intel/model_65x/Kconfig                   |  1 +
 src/cpu/intel/model_67x/Kconfig                   |  1 +
 src/cpu/intel/model_68x/Kconfig                   |  1 +
 src/cpu/intel/model_69x/Kconfig                   |  1 +
 src/cpu/intel/model_6bx/Kconfig                   |  1 +
 src/cpu/intel/model_6dx/Kconfig                   |  1 +
 src/cpu/intel/model_6ex/Kconfig                   |  1 +
 src/cpu/intel/model_6fx/Kconfig                   |  1 +
 src/cpu/intel/model_6xx/Kconfig                   |  1 +
 src/cpu/intel/model_f0x/Kconfig                   |  1 +
 src/cpu/intel/model_f1x/Kconfig                   |  1 +
 src/cpu/intel/model_f2x/Kconfig                   |  1 +
 src/cpu/intel/model_f3x/Kconfig                   |  1 +
 src/cpu/intel/model_f4x/Kconfig                   |  1 +
 src/cpu/qemu-x86/Kconfig                          |  1 +
 src/cpu/samsung/exynos5250/Kconfig                |  2 +-
 src/cpu/samsung/exynos5420/Kconfig                |  2 +-
 src/cpu/ti/am335x/Kconfig                         |  2 +-
 src/cpu/via/c3/Kconfig                            |  1 +
 src/cpu/via/c7/Kconfig                            |  1 +
 src/cpu/via/nano/Kconfig                          |  1 +
 src/mainboard/a-trend/atc-6220/Kconfig            |  1 -
 src/mainboard/a-trend/atc-6240/Kconfig            |  1 -
 src/mainboard/aaeon/pfm-540i_revb/Kconfig         |  1 -
 src/mainboard/abit/be6-ii_v2_0/Kconfig            |  1 -
 src/mainboard/advansus/a785e-i/Kconfig            |  1 -
 src/mainboard/advantech/pcm-5820/Kconfig          |  1 -
 src/mainboard/amd/bimini_fam10/Kconfig            |  1 -
 src/mainboard/amd/db800/Kconfig                   |  1 -
 src/mainboard/amd/dbm690t/Kconfig                 |  1 -
 src/mainboard/amd/dinar/Kconfig                   |  1 -
 src/mainboard/amd/inagua/Kconfig                  |  1 -
 src/mainboard/amd/mahogany/Kconfig                |  1 -
 src/mainboard/amd/mahogany_fam10/Kconfig          |  1 -
 src/mainboard/amd/norwich/Kconfig                 |  1 -
 src/mainboard/amd/olivehill/Kconfig               |  1 -
 src/mainboard/amd/parmer/Kconfig                  |  1 -
 src/mainboard/amd/persimmon/Kconfig               |  1 -
 src/mainboard/amd/pistachio/Kconfig               |  1 -
 src/mainboard/amd/rumba/Kconfig                   |  1 -
 src/mainboard/amd/serengeti_cheetah/Kconfig       |  1 -
 src/mainboard/amd/serengeti_cheetah_fam10/Kconfig |  1 -
 src/mainboard/amd/south_station/Kconfig           |  1 -
 src/mainboard/amd/thatcher/Kconfig                |  1 -
 src/mainboard/amd/tilapia_fam10/Kconfig           |  1 -
 src/mainboard/amd/torpedo/Kconfig                 |  1 -
 src/mainboard/amd/union_station/Kconfig           |  1 -
 src/mainboard/aopen/dxplplusu/Kconfig             |  1 -
 src/mainboard/arima/hdama/Kconfig                 |  1 -
 src/mainboard/artecgroup/dbe61/Kconfig            |  1 -
 src/mainboard/asi/mb_5blgp/Kconfig                |  1 -
 src/mainboard/asi/mb_5blmp/Kconfig                |  1 -
 src/mainboard/asrock/939a785gmh/Kconfig           |  1 -
 src/mainboard/asrock/e350m1/Kconfig               |  1 -
 src/mainboard/asrock/imb-a180/Kconfig             |  1 -
 src/mainboard/asus/a8n_e/Kconfig                  |  1 -
 src/mainboard/asus/a8n_sli/Kconfig                |  1 -
 src/mainboard/asus/a8v-e_deluxe/Kconfig           |  1 -
 src/mainboard/asus/a8v-e_se/Kconfig               |  1 -
 src/mainboard/asus/dsbf/Kconfig                   |  1 -
 src/mainboard/asus/f2a85-m/Kconfig                |  1 -
 src/mainboard/asus/k8v-x/Kconfig                  |  1 -
 src/mainboard/asus/m2n-e/Kconfig                  |  1 -
 src/mainboard/asus/m2v-mx_se/Kconfig              |  1 -
 src/mainboard/asus/m2v/Kconfig                    |  1 -
 src/mainboard/asus/m4a78-em/Kconfig               |  1 -
 src/mainboard/asus/m4a785-m/Kconfig               |  1 -
 src/mainboard/asus/m4a785t-m/Kconfig              |  1 -
 src/mainboard/asus/m5a88-v/Kconfig                |  1 -
 src/mainboard/asus/mew-am/Kconfig                 |  1 -
 src/mainboard/asus/mew-vm/Kconfig                 |  1 -
 src/mainboard/asus/p2b-d/Kconfig                  |  1 -
 src/mainboard/asus/p2b-ds/Kconfig                 |  1 -
 src/mainboard/asus/p2b-f/Kconfig                  |  1 -
 src/mainboard/asus/p2b-ls/Kconfig                 |  1 -
 src/mainboard/asus/p2b/Kconfig                    |  1 -
 src/mainboard/asus/p3b-f/Kconfig                  |  1 -
 src/mainboard/avalue/eax-785e/Kconfig             |  1 -
 src/mainboard/axus/tc320/Kconfig                  |  1 -
 src/mainboard/azza/pt-6ibd/Kconfig                |  1 -
 src/mainboard/bachmann/ot200/Kconfig              |  1 -
 src/mainboard/bcom/winnet100/Kconfig              |  1 -
 src/mainboard/bcom/winnetp680/Kconfig             |  1 -
 src/mainboard/biostar/m6tba/Kconfig               |  1 -
 src/mainboard/broadcom/blast/Kconfig              |  1 -
 src/mainboard/compaq/deskpro_en_sff_p600/Kconfig  |  1 -
 src/mainboard/cubietech/cubieboard/Kconfig        |  1 -
 src/mainboard/digitallogic/adl855pc/Kconfig       |  1 -
 src/mainboard/digitallogic/msm586seg/Kconfig      |  1 -
 src/mainboard/digitallogic/msm800sev/Kconfig      |  1 -
 src/mainboard/dmp/vortex86ex/Kconfig              |  1 -
 src/mainboard/eaglelion/5bcm/Kconfig              |  1 -
 src/mainboard/ecs/p6iwp-fe/Kconfig                |  1 -
 src/mainboard/emulation/qemu-armv7/Kconfig        |  1 -
 src/mainboard/emulation/qemu-i440fx/Kconfig       |  1 -
 src/mainboard/emulation/qemu-q35/Kconfig          |  1 -
 src/mainboard/getac/p470/Kconfig                  |  1 -
 src/mainboard/gigabyte/ga-6bxc/Kconfig            |  1 -
 src/mainboard/gigabyte/ga-6bxe/Kconfig            |  1 -
 src/mainboard/gigabyte/ga_2761gxdk/Kconfig        |  1 -
 src/mainboard/gigabyte/m57sli/Kconfig             |  1 -
 src/mainboard/gigabyte/ma785gm/Kconfig            |  1 -
 src/mainboard/gigabyte/ma785gmt/Kconfig           |  1 -
 src/mainboard/gigabyte/ma78gm/Kconfig             |  1 -
 src/mainboard/gizmosphere/gizmo/Kconfig           |  1 -
 src/mainboard/google/bolt/Kconfig                 |  1 -
 src/mainboard/google/butterfly/Kconfig            |  1 -
 src/mainboard/google/falco/Kconfig                |  1 -
 src/mainboard/google/link/Kconfig                 |  1 -
 src/mainboard/google/parrot/Kconfig               |  1 -
 src/mainboard/google/peppy/Kconfig                |  1 -
 src/mainboard/google/pit/Kconfig                  |  1 -
 src/mainboard/google/rambi/Kconfig                |  1 -
 src/mainboard/google/slippy/Kconfig               |  1 -
 src/mainboard/google/snow/Kconfig                 |  1 -
 src/mainboard/google/stout/Kconfig                |  1 -
 src/mainboard/hp/dl145_g1/Kconfig                 |  1 -
 src/mainboard/hp/dl145_g3/Kconfig                 |  1 -
 src/mainboard/hp/dl165_g6_fam10/Kconfig           |  1 -
 src/mainboard/hp/e_vectra_p2706t/Kconfig          |  1 -
 src/mainboard/hp/pavilion_m6_1035dx/Kconfig       |  1 -
 src/mainboard/ibase/mb899/Kconfig                 |  1 -
 src/mainboard/ibm/e325/Kconfig                    |  1 -
 src/mainboard/ibm/e326/Kconfig                    |  1 -
 src/mainboard/iei/juki-511p/Kconfig               |  1 -
 src/mainboard/iei/kino-780am2-fam10/Kconfig       |  1 -
 src/mainboard/iei/nova4899r/Kconfig               |  1 -
 src/mainboard/iei/pcisa-lx-800-r10/Kconfig        |  1 -
 src/mainboard/iei/pm-lx-800-r11/Kconfig           |  1 -
 src/mainboard/iei/pm-lx2-800-r10/Kconfig          |  1 -
 src/mainboard/iei/rocky-512/Kconfig               |  1 -
 src/mainboard/intel/baskingridge/Kconfig          |  1 -
 src/mainboard/intel/cougar_canyon2/Kconfig        |  1 -
 src/mainboard/intel/d810e2cb/Kconfig              |  1 -
 src/mainboard/intel/d945gclf/Kconfig              |  1 -
 src/mainboard/intel/eagleheights/Kconfig          |  1 -
 src/mainboard/intel/emeraldlake2/Kconfig          |  1 -
 src/mainboard/intel/jarrell/Kconfig               |  1 -
 src/mainboard/intel/mtarvon/Kconfig               |  1 -
 src/mainboard/intel/truxton/Kconfig               |  1 -
 src/mainboard/intel/wtm2/Kconfig                  |  1 -
 src/mainboard/intel/xe7501devkit/Kconfig          |  1 -
 src/mainboard/iwave/iWRainbowG6/Kconfig           |  1 -
 src/mainboard/iwill/dk8_htx/Kconfig               |  1 -
 src/mainboard/iwill/dk8s2/Kconfig                 |  1 -
 src/mainboard/iwill/dk8x/Kconfig                  |  1 -
 src/mainboard/jetway/j7f2/Kconfig                 |  1 -
 src/mainboard/jetway/j7f4k1g2e/Kconfig            |  1 -
 src/mainboard/jetway/j7f4k1g5d/Kconfig            |  1 -
 src/mainboard/jetway/nf81-t56n-lf/Kconfig         |  1 -
 src/mainboard/jetway/pa78vm5/Kconfig              |  1 -
 src/mainboard/kontron/986lcd-m/Kconfig            |  1 -
 src/mainboard/kontron/kt690/Kconfig               |  1 -
 src/mainboard/kontron/ktqm77/Kconfig              |  1 -
 src/mainboard/lanner/em8510/Kconfig               |  1 -
 src/mainboard/lenovo/t530/Kconfig                 |  1 -
 src/mainboard/lenovo/t60/Kconfig                  |  1 -
 src/mainboard/lenovo/x201/Kconfig                 |  1 -
 src/mainboard/lenovo/x230/Kconfig                 |  1 -
 src/mainboard/lenovo/x60/Kconfig                  |  1 -
 src/mainboard/linutop/linutop1/Kconfig            |  1 -
 src/mainboard/lippert/frontrunner-af/Kconfig      |  1 -
 src/mainboard/lippert/frontrunner/Kconfig         |  1 -
 src/mainboard/lippert/hurricane-lx/Kconfig        |  1 -
 src/mainboard/lippert/literunner-lx/Kconfig       |  1 -
 src/mainboard/lippert/roadrunner-lx/Kconfig       |  1 -
 src/mainboard/lippert/spacerunner-lx/Kconfig      |  1 -
 src/mainboard/lippert/toucan-af/Kconfig           |  1 -
 src/mainboard/mitac/6513wu/Kconfig                |  1 -
 src/mainboard/msi/ms6119/Kconfig                  |  1 -
 src/mainboard/msi/ms6147/Kconfig                  |  1 -
 src/mainboard/msi/ms6156/Kconfig                  |  1 -
 src/mainboard/msi/ms6178/Kconfig                  |  1 -
 src/mainboard/msi/ms7135/Kconfig                  |  1 -
 src/mainboard/msi/ms7260/Kconfig                  |  1 -
 src/mainboard/msi/ms9185/Kconfig                  |  1 -
 src/mainboard/msi/ms9282/Kconfig                  |  1 -
 src/mainboard/msi/ms9652_fam10/Kconfig            |  1 -
 src/mainboard/nec/powermate2000/Kconfig           |  1 -
 src/mainboard/newisys/khepri/Kconfig              |  1 -
 src/mainboard/nokia/ip530/Kconfig                 |  1 -
 src/mainboard/nvidia/l1_2pvv/Kconfig              |  1 -
 src/mainboard/pcengines/alix1c/Kconfig            |  1 -
 src/mainboard/pcengines/alix2c/Kconfig            |  1 -
 src/mainboard/pcengines/alix2d/Kconfig            |  1 -
 src/mainboard/pcengines/alix6/Kconfig             |  1 -
 src/mainboard/rca/rm4100/Kconfig                  |  1 -
 src/mainboard/roda/rk886ex/Kconfig                |  1 -
 src/mainboard/roda/rk9/Kconfig                    |  1 -
 src/mainboard/samsung/lumpy/Kconfig               |  1 -
 src/mainboard/samsung/stumpy/Kconfig              |  1 -
 src/mainboard/siemens/sitemp_g1p1/Kconfig         |  1 -
 src/mainboard/soyo/sy-6ba-plus-iii/Kconfig        |  1 -
 src/mainboard/sunw/ultra40/Kconfig                |  1 -
 src/mainboard/supermicro/h8dme/Kconfig            |  1 -
 src/mainboard/supermicro/h8dmr/Kconfig            |  1 -
 src/mainboard/supermicro/h8dmr_fam10/Kconfig      |  1 -
 src/mainboard/supermicro/h8qgi/Kconfig            |  1 -
 src/mainboard/supermicro/h8qme_fam10/Kconfig      |  1 -
 src/mainboard/supermicro/h8scm/Kconfig            |  1 -
 src/mainboard/supermicro/h8scm_fam10/Kconfig      |  1 -
 src/mainboard/supermicro/x6dai_g/Kconfig          |  1 -
 src/mainboard/supermicro/x6dhe_g/Kconfig          |  1 -
 src/mainboard/supermicro/x6dhe_g2/Kconfig         |  1 -
 src/mainboard/supermicro/x6dhr_ig/Kconfig         |  1 -
 src/mainboard/supermicro/x6dhr_ig2/Kconfig        |  1 -
 src/mainboard/supermicro/x7db8/Kconfig            |  1 -
 src/mainboard/technexion/tim5690/Kconfig          |  1 -
 src/mainboard/technexion/tim8690/Kconfig          |  1 -
 src/mainboard/technologic/ts5300/Kconfig          |  1 -
 src/mainboard/televideo/tc7020/Kconfig            |  1 -
 src/mainboard/thomson/ip1000/Kconfig              |  1 -
 src/mainboard/ti/beaglebone/Kconfig               |  1 -
 src/mainboard/traverse/geos/Kconfig               |  1 -
 src/mainboard/tyan/s1846/Kconfig                  |  1 -
 src/mainboard/tyan/s2735/Kconfig                  |  1 -
 src/mainboard/tyan/s2850/Kconfig                  |  1 -
 src/mainboard/tyan/s2875/Kconfig                  |  1 -
 src/mainboard/tyan/s2880/Kconfig                  |  1 -
 src/mainboard/tyan/s2881/Kconfig                  |  1 -
 src/mainboard/tyan/s2882/Kconfig                  |  1 -
 src/mainboard/tyan/s2885/Kconfig                  |  1 -
 src/mainboard/tyan/s2891/Kconfig                  |  1 -
 src/mainboard/tyan/s2892/Kconfig                  |  1 -
 src/mainboard/tyan/s2895/Kconfig                  |  1 -
 src/mainboard/tyan/s2912/Kconfig                  |  1 -
 src/mainboard/tyan/s2912_fam10/Kconfig            |  1 -
 src/mainboard/tyan/s4880/Kconfig                  |  1 -
 src/mainboard/tyan/s4882/Kconfig                  |  1 -
 src/mainboard/tyan/s8226/Kconfig                  |  1 -
 src/mainboard/via/epia-cn/Kconfig                 |  1 -
 src/mainboard/via/epia-m/Kconfig                  |  1 -
 src/mainboard/via/epia-m700/Kconfig               |  1 -
 src/mainboard/via/epia-m850/Kconfig               |  1 -
 src/mainboard/via/epia-mii/Kconfig                |  1 -
 src/mainboard/via/epia-ml/Kconfig                 |  1 -
 src/mainboard/via/epia-n/Kconfig                  |  1 -
 src/mainboard/via/epia/Kconfig                    |  1 -
 src/mainboard/via/pc2500e/Kconfig                 |  1 -
 src/mainboard/via/vt8454c/Kconfig                 |  1 -
 src/mainboard/winent/mb6047/Kconfig               |  1 -
 src/mainboard/winent/pl6064/Kconfig               |  1 -
 src/mainboard/wyse/s50/Kconfig                    |  1 -
 src/soc/Kconfig                                   |  2 -
 src/soc/intel/baytrail/Kconfig                    |  1 +
 util/abuild/abuild                                | 68 -----------------------
 264 files changed, 41 insertions(+), 301 deletions(-)

diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index bf5ce8e..6fced37 100644
--- a/src/cpu/Kconfig
+++ b/src/cpu/Kconfig
@@ -1,17 +1,12 @@
 # Warning: This file is included whether or not the if is here.
 # The if controls how the evaluation occurs.
 # (See also src/Kconfig)
-if ARCH_ARMV7

source src/cpu/allwinner/Kconfig
 source src/cpu/armltd/Kconfig
 source src/cpu/samsung/Kconfig
 source src/cpu/ti/Kconfig

-endif	# ARCH_ARM
-
-if ARCH_X86
-
 source src/cpu/amd/Kconfig
 source src/cpu/dmp/Kconfig
 source src/cpu/intel/Kconfig
@@ -19,6 +14,8 @@ source src/cpu/via/Kconfig
 source src/cpu/qemu-x86/Kconfig
 source src/cpu/x86/Kconfig

+if ARCH_X86
+
 config CACHE_AS_RAM
    bool
    default !ROMCC
diff --git a/src/cpu/allwinner/a10/Kconfig b/src/cpu/allwinner/a10/Kconfig
index 267e1f4..f76a7b6 100644
--- a/src/cpu/allwinner/a10/Kconfig
+++ b/src/cpu/allwinner/a10/Kconfig
@@ -6,6 +6,7 @@ if CPU_ALLWINNER_A10

config CPU_SPECIFIC_OPTIONS
    def_bool y
+	select ARCH_ARMV7
    select HAVE_MONOTONIC_TIMER
    select HAVE_UART_SPECIAL
    select BOOTBLOCK_CONSOLE
diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig
index a73c5ce..fa36f38 100644
--- a/src/cpu/amd/agesa/Kconfig
+++ b/src/cpu/amd/agesa/Kconfig
@@ -26,6 +26,7 @@ config CPU_AMD_AGESA
    default y if CPU_AMD_AGESA_FAMILY15_TN
    default y if CPU_AMD_AGESA_FAMILY16_KB
    default n
+	select ARCH_X86
    select TSC_SYNC_LFENCE
    select UDELAY_LAPIC
    select LAPIC_MONOTONIC_TIMER
diff --git a/src/cpu/amd/geode_gx1/Kconfig b/src/cpu/amd/geode_gx1/Kconfig
index fa1d052..b87e8bc 100644
--- a/src/cpu/amd/geode_gx1/Kconfig
+++ b/src/cpu/amd/geode_gx1/Kconfig
@@ -19,6 +19,7 @@

config CPU_AMD_GEODE_GX1
    bool
+	select ARCH_X86

if CPU_AMD_GEODE_GX1

diff --git a/src/cpu/amd/geode_gx2/Kconfig b/src/cpu/amd/geode_gx2/Kconfig
index fe5a291..b96c770 100644
--- a/src/cpu/amd/geode_gx2/Kconfig
+++ b/src/cpu/amd/geode_gx2/Kconfig
@@ -19,6 +19,7 @@

config CPU_AMD_GEODE_GX2
    bool
+	select ARCH_X86

if CPU_AMD_GEODE_GX2

diff --git a/src/cpu/amd/geode_lx/Kconfig b/src/cpu/amd/geode_lx/Kconfig
index ac59c3f..6aceab2 100644
--- a/src/cpu/amd/geode_lx/Kconfig
+++ b/src/cpu/amd/geode_lx/Kconfig
@@ -1,5 +1,6 @@
 config CPU_AMD_GEODE_LX
    bool
+	select ARCH_X86

if CPU_AMD_GEODE_LX

diff --git a/src/cpu/amd/model_10xxx/Kconfig b/src/cpu/amd/model_10xxx/Kconfig
index bc20219..30c2486 100644
--- a/src/cpu/amd/model_10xxx/Kconfig
+++ b/src/cpu/amd/model_10xxx/Kconfig
@@ -1,5 +1,6 @@
 config CPU_AMD_MODEL_10XXX
    bool
+	select ARCH_X86
    select SSE
    select SSE2
    select MMCONF_SUPPORT_DEFAULT
diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig
index 2ea381e..1a811f4 100644
--- a/src/cpu/amd/model_fxx/Kconfig
+++ b/src/cpu/amd/model_fxx/Kconfig
@@ -1,5 +1,6 @@
 config CPU_AMD_MODEL_FXX
    bool
+	select ARCH_X86
    select MMX
    select SSE
    select SSE2
diff --git a/src/cpu/amd/sc520/Kconfig b/src/cpu/amd/sc520/Kconfig
index 6d9494e..46377be 100644
--- a/src/cpu/amd/sc520/Kconfig
+++ b/src/cpu/amd/sc520/Kconfig
@@ -1,2 +1,3 @@
 config CPU_AMD_SC520
    bool
+	select ARCH_X86
diff --git a/src/cpu/armltd/cortex-a9/Kconfig b/src/cpu/armltd/cortex-a9/Kconfig
index 04861a6..f46c6ff 100644
--- a/src/cpu/armltd/cortex-a9/Kconfig
+++ b/src/cpu/armltd/cortex-a9/Kconfig
@@ -1,6 +1,6 @@
 config CPU_ARMLTD_CORTEX_A9
-	depends on ARCH_ARMV7
    bool
+	select ARCH_ARMV7
    select EARLY_CONSOLE
    default n

diff --git a/src/cpu/dmp/vortex86ex/Kconfig b/src/cpu/dmp/vortex86ex/Kconfig
index 54db4e0..aea8889 100644
--- a/src/cpu/dmp/vortex86ex/Kconfig
+++ b/src/cpu/dmp/vortex86ex/Kconfig
@@ -19,4 +19,5 @@

config CPU_DMP_VORTEX86EX
    bool
+	select ARCH_X86
    select UDELAY_TSC
diff --git a/src/cpu/intel/ep80579/Kconfig b/src/cpu/intel/ep80579/Kconfig
index 380869a..fa96f8d 100644
--- a/src/cpu/intel/ep80579/Kconfig
+++ b/src/cpu/intel/ep80579/Kconfig
@@ -1,4 +1,5 @@
 config CPU_INTEL_EP80579
    bool
+	select ARCH_X86
    select SSE
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/fsp_model_206ax/Kconfig b/src/cpu/intel/fsp_model_206ax/Kconfig
index 6a008bf..22d01e6 100644
--- a/src/cpu/intel/fsp_model_206ax/Kconfig
+++ b/src/cpu/intel/fsp_model_206ax/Kconfig
@@ -28,6 +28,7 @@ if CPU_INTEL_FSP_MODEL_206AX || CPU_INTEL_FSP_MODEL_306AX

config CPU_SPECIFIC_OPTIONS
    def_bool y
+	select ARCH_X86
    select SMP
    select SSE2
    select UDELAY_LAPIC
diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig
index b13d686..97309ae 100644
--- a/src/cpu/intel/haswell/Kconfig
+++ b/src/cpu/intel/haswell/Kconfig
@@ -6,6 +6,7 @@ if CPU_INTEL_HASWELL

config CPU_SPECIFIC_OPTIONS
    def_bool y
+	select ARCH_X86
    select BACKUP_DEFAULT_SMM_REGION
    select SMP
    select SSE2
diff --git a/src/cpu/intel/model_1067x/Kconfig b/src/cpu/intel/model_1067x/Kconfig
index 7d5bf94..4d6add6 100644
--- a/src/cpu/intel/model_1067x/Kconfig
+++ b/src/cpu/intel/model_1067x/Kconfig
@@ -1,5 +1,6 @@
 config CPU_INTEL_MODEL_1067X
    bool
+	select ARCH_X86
    select SMP
    select SSE2
    select TSC_SYNC_MFENCE
diff --git a/src/cpu/intel/model_106cx/Kconfig b/src/cpu/intel/model_106cx/Kconfig
index c438008..ea6f5ca 100644
--- a/src/cpu/intel/model_106cx/Kconfig
+++ b/src/cpu/intel/model_106cx/Kconfig
@@ -1,5 +1,6 @@
 config CPU_INTEL_MODEL_106CX
    bool
+	select ARCH_X86
    select SMP
    select SSE2
    select UDELAY_LAPIC
diff --git a/src/cpu/intel/model_2065x/Kconfig b/src/cpu/intel/model_2065x/Kconfig
index bbb4eb1..4c7456d 100644
--- a/src/cpu/intel/model_2065x/Kconfig
+++ b/src/cpu/intel/model_2065x/Kconfig
@@ -5,6 +5,7 @@ if CPU_INTEL_MODEL_2065X

config CPU_SPECIFIC_OPTIONS
    def_bool y
+	select ARCH_X86
    select SMP
    select SSE
    select SSE2
diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig
index 90af45d..64b2a0a 100644
--- a/src/cpu/intel/model_206ax/Kconfig
+++ b/src/cpu/intel/model_206ax/Kconfig
@@ -8,6 +8,7 @@ if CPU_INTEL_MODEL_206AX || CPU_INTEL_MODEL_306AX

config CPU_SPECIFIC_OPTIONS
    def_bool y
+	select ARCH_X86
    select SMP
    select SSE2
    select UDELAY_LAPIC
diff --git a/src/cpu/intel/model_65x/Kconfig b/src/cpu/intel/model_65x/Kconfig
index e8f0767..b3fa7bd 100644
--- a/src/cpu/intel/model_65x/Kconfig
+++ b/src/cpu/intel/model_65x/Kconfig
@@ -1,4 +1,5 @@
 config CPU_INTEL_MODEL_65X
    bool
+	select ARCH_X86
    select SMP
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_67x/Kconfig b/src/cpu/intel/model_67x/Kconfig
index 74ef8d5..7558bc2 100644
--- a/src/cpu/intel/model_67x/Kconfig
+++ b/src/cpu/intel/model_67x/Kconfig
@@ -1,4 +1,5 @@
 config CPU_INTEL_MODEL_67X
    bool
+	select ARCH_X86
    select SMP
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_68x/Kconfig b/src/cpu/intel/model_68x/Kconfig
index 9d9983e..670163a 100644
--- a/src/cpu/intel/model_68x/Kconfig
+++ b/src/cpu/intel/model_68x/Kconfig
@@ -20,5 +20,6 @@

config CPU_INTEL_MODEL_68X
    bool
+	select ARCH_X86
    select SMP
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_69x/Kconfig b/src/cpu/intel/model_69x/Kconfig
index 4e88979..e4a0e6c 100644
--- a/src/cpu/intel/model_69x/Kconfig
+++ b/src/cpu/intel/model_69x/Kconfig
@@ -1,4 +1,5 @@
 config CPU_INTEL_MODEL_69X
    bool
+	select ARCH_X86
    select SMP
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_6bx/Kconfig b/src/cpu/intel/model_6bx/Kconfig
index 26b5995..4dc6fe6 100644
--- a/src/cpu/intel/model_6bx/Kconfig
+++ b/src/cpu/intel/model_6bx/Kconfig
@@ -1,4 +1,5 @@
 config CPU_INTEL_MODEL_6BX
    bool
+	select ARCH_X86
    select SMP
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_6dx/Kconfig b/src/cpu/intel/model_6dx/Kconfig
index 546d9ec..e6d5f1e 100644
--- a/src/cpu/intel/model_6dx/Kconfig
+++ b/src/cpu/intel/model_6dx/Kconfig
@@ -1,4 +1,5 @@
 config CPU_INTEL_MODEL_6DX
    bool
+	select ARCH_X86
    select SMP
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_6ex/Kconfig b/src/cpu/intel/model_6ex/Kconfig
index 8187838..eee864d 100644
--- a/src/cpu/intel/model_6ex/Kconfig
+++ b/src/cpu/intel/model_6ex/Kconfig
@@ -1,5 +1,6 @@
 config CPU_INTEL_MODEL_6EX
    bool
+	select ARCH_X86
    select SMP
    select SSE2
    select UDELAY_LAPIC
diff --git a/src/cpu/intel/model_6fx/Kconfig b/src/cpu/intel/model_6fx/Kconfig
index 3335a26..b8de303 100644
--- a/src/cpu/intel/model_6fx/Kconfig
+++ b/src/cpu/intel/model_6fx/Kconfig
@@ -1,5 +1,6 @@
 config CPU_INTEL_MODEL_6FX
    bool
+	select ARCH_X86
    select SMP
    select SSE2
    select UDELAY_LAPIC
diff --git a/src/cpu/intel/model_6xx/Kconfig b/src/cpu/intel/model_6xx/Kconfig
index b572385..49cfe2d 100644
--- a/src/cpu/intel/model_6xx/Kconfig
+++ b/src/cpu/intel/model_6xx/Kconfig
@@ -1,4 +1,5 @@
 config CPU_INTEL_MODEL_6XX
    bool
+	select ARCH_X86
    select SMP
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_f0x/Kconfig b/src/cpu/intel/model_f0x/Kconfig
index 0616589..2ed68d1 100644
--- a/src/cpu/intel/model_f0x/Kconfig
+++ b/src/cpu/intel/model_f0x/Kconfig
@@ -1,4 +1,5 @@
 config CPU_INTEL_MODEL_F0X
    bool
+	select ARCH_X86
    select SMP
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_f1x/Kconfig b/src/cpu/intel/model_f1x/Kconfig
index fd64920..3bdb7f6 100644
--- a/src/cpu/intel/model_f1x/Kconfig
+++ b/src/cpu/intel/model_f1x/Kconfig
@@ -1,4 +1,5 @@
 config CPU_INTEL_MODEL_F1X
    bool
+	select ARCH_X86
    select SMP
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_f2x/Kconfig b/src/cpu/intel/model_f2x/Kconfig
index 8483d33..62393a8 100644
--- a/src/cpu/intel/model_f2x/Kconfig
+++ b/src/cpu/intel/model_f2x/Kconfig
@@ -1,4 +1,5 @@
 config CPU_INTEL_MODEL_F2X
    bool
+	select ARCH_X86
    select SMP
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_f3x/Kconfig b/src/cpu/intel/model_f3x/Kconfig
index 8ae2dcf..5c9d0a3 100644
--- a/src/cpu/intel/model_f3x/Kconfig
+++ b/src/cpu/intel/model_f3x/Kconfig
@@ -1,4 +1,5 @@
 config CPU_INTEL_MODEL_F3X
    bool
+	select ARCH_X86
    select SMP
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/intel/model_f4x/Kconfig b/src/cpu/intel/model_f4x/Kconfig
index c21a274..849dcd0 100644
--- a/src/cpu/intel/model_f4x/Kconfig
+++ b/src/cpu/intel/model_f4x/Kconfig
@@ -1,4 +1,5 @@
 config CPU_INTEL_MODEL_F4X
    bool
+	select ARCH_X86
    select SMP
    select SUPPORT_CPU_UCODE_IN_CBFS
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig
index 6c5c3fd..e54e4db 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -19,3 +19,4 @@

config CPU_QEMU_X86
    bool
+	select ARCH_X86
diff --git a/src/cpu/samsung/exynos5250/Kconfig b/src/cpu/samsung/exynos5250/Kconfig
index 9320184..b8042e3 100644
--- a/src/cpu/samsung/exynos5250/Kconfig
+++ b/src/cpu/samsung/exynos5250/Kconfig
@@ -1,5 +1,5 @@
 config CPU_SAMSUNG_EXYNOS5250
-	depends on ARCH_ARMV7
+	select ARCH_ARMV7
    select HAVE_MONOTONIC_TIMER
    select HAVE_UART_SPECIAL
    select EARLY_CONSOLE
diff --git a/src/cpu/samsung/exynos5420/Kconfig b/src/cpu/samsung/exynos5420/Kconfig
index 5f78cc5..6207adf 100644
--- a/src/cpu/samsung/exynos5420/Kconfig
+++ b/src/cpu/samsung/exynos5420/Kconfig
@@ -1,5 +1,5 @@
 config CPU_SAMSUNG_EXYNOS5420
-	depends on ARCH_ARMV7
+	select ARCH_ARMV7
    select HAVE_MONOTONIC_TIMER
    select HAVE_UART_SPECIAL
    select EARLY_CONSOLE
diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig
index fdc5824..22a02ad 100644
--- a/src/cpu/ti/am335x/Kconfig
+++ b/src/cpu/ti/am335x/Kconfig
@@ -1,5 +1,5 @@
 config CPU_TI_AM335X
-	depends on ARCH_ARMV7
+	select ARCH_ARMV7
    select HAVE_MONOTONIC_TIMER
    select HAVE_UART_SPECIAL
    select BOOTBLOCK_CONSOLE
diff --git a/src/cpu/via/c3/Kconfig b/src/cpu/via/c3/Kconfig
index 259a1f2..566f07c 100644
--- a/src/cpu/via/c3/Kconfig
+++ b/src/cpu/via/c3/Kconfig
@@ -5,6 +5,7 @@ if CPU_VIA_C3

config CPU_SPECIFIC_OPTIONS
    def_bool y
+	select ARCH_X86
    select UDELAY_TSC
    select MMX
    select IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS
diff --git a/src/cpu/via/c7/Kconfig b/src/cpu/via/c7/Kconfig
index ebbb8f9..d5f1a41 100644
--- a/src/cpu/via/c7/Kconfig
+++ b/src/cpu/via/c7/Kconfig
@@ -5,6 +5,7 @@ if CPU_VIA_C7

config CPU_SPECIFIC_OPTIONS
    def_bool y
+	select ARCH_X86
    select UDELAY_TSC
    select MMX
    select SSE2
diff --git a/src/cpu/via/nano/Kconfig b/src/cpu/via/nano/Kconfig
index 674c0f3..0f4f994 100644
--- a/src/cpu/via/nano/Kconfig
+++ b/src/cpu/via/nano/Kconfig
@@ -24,6 +24,7 @@ if CPU_VIA_NANO

config CPU_SPECIFIC_OPTIONS
    def_bool y
+	select ARCH_X86
    select UDELAY_TSC
    select MMX
    select SSE2
diff --git a/src/mainboard/a-trend/atc-6220/Kconfig b/src/mainboard/a-trend/atc-6220/Kconfig
index 81c23a8..036d8e6 100644
--- a/src/mainboard/a-trend/atc-6220/Kconfig
+++ b/src/mainboard/a-trend/atc-6220/Kconfig
@@ -20,7 +20,6 @@ if BOARD_A_TREND_ATC_6220

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/a-trend/atc-6240/Kconfig b/src/mainboard/a-trend/atc-6240/Kconfig
index da94c7f..d19f92d 100644
--- a/src/mainboard/a-trend/atc-6240/Kconfig
+++ b/src/mainboard/a-trend/atc-6240/Kconfig
@@ -20,7 +20,6 @@ if BOARD_A_TREND_ATC_6240

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/aaeon/pfm-540i_revb/Kconfig b/src/mainboard/aaeon/pfm-540i_revb/Kconfig
index 9986987..6b156b2 100644
--- a/src/mainboard/aaeon/pfm-540i_revb/Kconfig
+++ b/src/mainboard/aaeon/pfm-540i_revb/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AAEON_PFM_540I_REVB

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/abit/be6-ii_v2_0/Kconfig b/src/mainboard/abit/be6-ii_v2_0/Kconfig
index feb00de..5dc1ca0 100644
--- a/src/mainboard/abit/be6-ii_v2_0/Kconfig
+++ b/src/mainboard/abit/be6-ii_v2_0/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ABIT_BE6_II_V2_0

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/advansus/a785e-i/Kconfig b/src/mainboard/advansus/a785e-i/Kconfig
index 32500d6..52ec827 100644
--- a/src/mainboard/advansus/a785e-i/Kconfig
+++ b/src/mainboard/advansus/a785e-i/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ADVANSUS_A785E_I

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_ASB2
    select DIMM_DDR3
    select DIMM_REGISTERED
diff --git a/src/mainboard/advantech/pcm-5820/Kconfig b/src/mainboard/advantech/pcm-5820/Kconfig
index 25ff69c..86bcd7a 100644
--- a/src/mainboard/advantech/pcm-5820/Kconfig
+++ b/src/mainboard/advantech/pcm-5820/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ADVANTECH_PCM_5820

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_GX1
    select NORTHBRIDGE_AMD_GX1
    select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/amd/bimini_fam10/Kconfig b/src/mainboard/amd/bimini_fam10/Kconfig
index a04c131..f9557b2 100644
--- a/src/mainboard/amd/bimini_fam10/Kconfig
+++ b/src/mainboard/amd/bimini_fam10/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AMD_BIMINI_FAM10

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_ASB2
    select DIMM_DDR3
    select DIMM_REGISTERED
diff --git a/src/mainboard/amd/db800/Kconfig b/src/mainboard/amd/db800/Kconfig
index ee2aa0f..c6f99e9 100644
--- a/src/mainboard/amd/db800/Kconfig
+++ b/src/mainboard/amd/db800/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AMD_DB800

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig
index ba68a54..70d63ad 100644
--- a/src/mainboard/amd/dbm690t/Kconfig
+++ b/src/mainboard/amd/dbm690t/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AMD_DBM690T

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_S1G1
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_RS690
diff --git a/src/mainboard/amd/dinar/Kconfig b/src/mainboard/amd/dinar/Kconfig
index 6768a57..0464479 100644
--- a/src/mainboard/amd/dinar/Kconfig
+++ b/src/mainboard/amd/dinar/Kconfig
@@ -21,7 +21,6 @@ if BOARD_AMD_DINAR

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY15
    select CPU_AMD_SOCKET_G34
    select NORTHBRIDGE_AMD_AGESA_FAMILY15
diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig
index 6713ce7..2948b52 100644
--- a/src/mainboard/amd/inagua/Kconfig
+++ b/src/mainboard/amd/inagua/Kconfig
@@ -21,7 +21,6 @@ if BOARD_AMD_INAGUA

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY14
    select NORTHBRIDGE_AMD_AGESA_FAMILY14
    select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/amd/mahogany/Kconfig b/src/mainboard/amd/mahogany/Kconfig
index 7e3486f..394ad77 100644
--- a/src/mainboard/amd/mahogany/Kconfig
+++ b/src/mainboard/amd/mahogany/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AMD_MAHOGANY

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM2
    select DIMM_DDR2
    select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig
index 2bc6a1d..b719592 100644
--- a/src/mainboard/amd/mahogany_fam10/Kconfig
+++ b/src/mainboard/amd/mahogany_fam10/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AMD_MAHOGANY_FAM10

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM2R2
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/amd/norwich/Kconfig b/src/mainboard/amd/norwich/Kconfig
index dec8e01..eb83c1e 100644
--- a/src/mainboard/amd/norwich/Kconfig
+++ b/src/mainboard/amd/norwich/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AMD_NORWICH

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/amd/olivehill/Kconfig b/src/mainboard/amd/olivehill/Kconfig
index 8be5a18..452f16d 100644
--- a/src/mainboard/amd/olivehill/Kconfig
+++ b/src/mainboard/amd/olivehill/Kconfig
@@ -21,7 +21,6 @@ if BOARD_AMD_OLIVEHILL

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY16_KB
    select NORTHBRIDGE_AMD_AGESA_FAMILY16_KB
    select SOUTHBRIDGE_AMD_AGESA_YANGTZE
diff --git a/src/mainboard/amd/parmer/Kconfig b/src/mainboard/amd/parmer/Kconfig
index 16fadfa..df26b2b 100644
--- a/src/mainboard/amd/parmer/Kconfig
+++ b/src/mainboard/amd/parmer/Kconfig
@@ -21,7 +21,6 @@ if BOARD_AMD_PARMER

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY15_TN
    select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
    select SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index e09a170..1e03edb 100644
--- a/src/mainboard/amd/persimmon/Kconfig
+++ b/src/mainboard/amd/persimmon/Kconfig
@@ -21,7 +21,6 @@ if BOARD_AMD_PERSIMMON

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY14
    select NORTHBRIDGE_AMD_AGESA_FAMILY14
    select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig
index 2eb6612..9a91eec 100644
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/src/mainboard/amd/pistachio/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AMD_PISTACHIO

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM2
    select DIMM_DDR2
    select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/amd/rumba/Kconfig b/src/mainboard/amd/rumba/Kconfig
index d600a58..2aea274 100644
--- a/src/mainboard/amd/rumba/Kconfig
+++ b/src/mainboard/amd/rumba/Kconfig
@@ -20,7 +20,6 @@ if BOARD_AMD_RUMBA

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_GX2
    select NORTHBRIDGE_AMD_GX2
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index 5a6f022..53dd595 100644
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AMD_SERENGETI_CHEETAH

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select SOUTHBRIDGE_AMD_AMD8132
    select SOUTHBRIDGE_AMD_AMD8151
    select CPU_AMD_SOCKET_F
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index 37cbfa4..04a1ce0 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AMD_SERENGETI_CHEETAH_FAM10

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F_1207
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig
index 346a556..9709c61 100644
--- a/src/mainboard/amd/south_station/Kconfig
+++ b/src/mainboard/amd/south_station/Kconfig
@@ -21,7 +21,6 @@ if BOARD_AMD_SOUTHSTATION

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY14
    select NORTHBRIDGE_AMD_AGESA_FAMILY14
    select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/amd/thatcher/Kconfig b/src/mainboard/amd/thatcher/Kconfig
index 66374f2..1f12883 100644
--- a/src/mainboard/amd/thatcher/Kconfig
+++ b/src/mainboard/amd/thatcher/Kconfig
@@ -21,7 +21,6 @@ if BOARD_AMD_THATCHER

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY15_TN
    select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
    select SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig
index 111ac29..7ebf487 100644
--- a/src/mainboard/amd/tilapia_fam10/Kconfig
+++ b/src/mainboard/amd/tilapia_fam10/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AMD_TILAPIA_FAM10

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM3
    select DIMM_DDR3
    select DIMM_REGISTERED
diff --git a/src/mainboard/amd/torpedo/Kconfig b/src/mainboard/amd/torpedo/Kconfig
index 2e16bb4..85d9d93 100644
--- a/src/mainboard/amd/torpedo/Kconfig
+++ b/src/mainboard/amd/torpedo/Kconfig
@@ -21,7 +21,6 @@ if BOARD_AMD_TORPEDO

config BOARD_SPECIFIC_OPTIONS # dummy
         def_bool y
-  select ARCH_X86
         select DIMM_DDR3
         select DIMM_UNREGISTERED
   select CPU_AMD_AGESA_FAMILY12
diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig
index 69f6548..2d0cadb 100644
--- a/src/mainboard/amd/union_station/Kconfig
+++ b/src/mainboard/amd/union_station/Kconfig
@@ -21,7 +21,6 @@ if BOARD_AMD_UNIONSTATION

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY14
    select NORTHBRIDGE_AMD_AGESA_FAMILY14
    select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/aopen/dxplplusu/Kconfig b/src/mainboard/aopen/dxplplusu/Kconfig
index c620c9a..1802b5a 100644
--- a/src/mainboard/aopen/dxplplusu/Kconfig
+++ b/src/mainboard/aopen/dxplplusu/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AOPEN_DXPLPLUSU

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MPGA604
    select NORTHBRIDGE_INTEL_E7505
    select SOUTHBRIDGE_INTEL_I82870
diff --git a/src/mainboard/arima/hdama/Kconfig b/src/mainboard/arima/hdama/Kconfig
index 2b6f758..49860b3 100644
--- a/src/mainboard/arima/hdama/Kconfig
+++ b/src/mainboard/arima/hdama/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ARIMA_HDAMA

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/artecgroup/dbe61/Kconfig b/src/mainboard/artecgroup/dbe61/Kconfig
index 99a6218..c512f7b 100644
--- a/src/mainboard/artecgroup/dbe61/Kconfig
+++ b/src/mainboard/artecgroup/dbe61/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ARTECGROUP_DBE61 || BOARD_LINUTOP_LINUTOP1

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/asi/mb_5blgp/Kconfig b/src/mainboard/asi/mb_5blgp/Kconfig
index 08ab2e0..f69f6ef 100644
--- a/src/mainboard/asi/mb_5blgp/Kconfig
+++ b/src/mainboard/asi/mb_5blgp/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ASI_MB_5BLGP

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_GX1
    select NORTHBRIDGE_AMD_GX1
    select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/asi/mb_5blmp/Kconfig b/src/mainboard/asi/mb_5blmp/Kconfig
index e8c8dde..a40c86c 100644
--- a/src/mainboard/asi/mb_5blmp/Kconfig
+++ b/src/mainboard/asi/mb_5blmp/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ASI_MB_5BLMP

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_GX1
    select NORTHBRIDGE_AMD_GX1
    select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/asrock/939a785gmh/Kconfig b/src/mainboard/asrock/939a785gmh/Kconfig
index 9d3dd5c..cfaa599 100644
--- a/src/mainboard/asrock/939a785gmh/Kconfig
+++ b/src/mainboard/asrock/939a785gmh/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ASROCK_939A785GMH

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_939
    select K8_HT_FREQ_1G_SUPPORT
    select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig
index 561f4bc..664c6c7 100644
--- a/src/mainboard/asrock/e350m1/Kconfig
+++ b/src/mainboard/asrock/e350m1/Kconfig
@@ -21,7 +21,6 @@ if BOARD_ASROCK_E350M1

config BOARD_SPECIFIC_OPTIONS # dummy
         def_bool y
-  select ARCH_X86
   select CPU_AMD_AGESA_FAMILY14
   select NORTHBRIDGE_AMD_AGESA_FAMILY14
   select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/asrock/imb-a180/Kconfig b/src/mainboard/asrock/imb-a180/Kconfig
index ccd060e..d27e1d4 100644
--- a/src/mainboard/asrock/imb-a180/Kconfig
+++ b/src/mainboard/asrock/imb-a180/Kconfig
@@ -21,7 +21,6 @@ if BOARD_ASROCK_IMB_A180

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY16_KB
    select NORTHBRIDGE_AMD_AGESA_FAMILY16_KB
    select SOUTHBRIDGE_AMD_AGESA_YANGTZE
diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig
index 43a2d2c..86601ed 100644
--- a/src/mainboard/asus/a8n_e/Kconfig
+++ b/src/mainboard/asus/a8n_e/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ASUS_A8N_E || BOARD_ASUS_A8N_SLI

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_939
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/asus/a8n_sli/Kconfig b/src/mainboard/asus/a8n_sli/Kconfig
index fdeaf87..e2ac03d 100644
--- a/src/mainboard/asus/a8n_sli/Kconfig
+++ b/src/mainboard/asus/a8n_sli/Kconfig
@@ -1,7 +1,6 @@
 if BOARD_ASUS_A8N_SLI

# Dummy for abuild
-#select ARCH_X86

config MAINBOARD_PART_NUMBER
    string
diff --git a/src/mainboard/asus/a8v-e_deluxe/Kconfig b/src/mainboard/asus/a8v-e_deluxe/Kconfig
index e953ed4..a1533c4 100644
--- a/src/mainboard/asus/a8v-e_deluxe/Kconfig
+++ b/src/mainboard/asus/a8v-e_deluxe/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ASUS_A8V_E_DELUXE

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_939
    select K8_HT_FREQ_1G_SUPPORT
    select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index c5b9374..dcc75fa 100644
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ASUS_A8V_E_SE

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_939
    select K8_HT_FREQ_1G_SUPPORT
    select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/asus/dsbf/Kconfig b/src/mainboard/asus/dsbf/Kconfig
index 99aa56d..c130a9f 100644
--- a/src/mainboard/asus/dsbf/Kconfig
+++ b/src/mainboard/asus/dsbf/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ASUS_DSBF

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_LGA771
    select SOUTHBRIDGE_INTEL_I3100
    select NORTHBRIDGE_INTEL_I5000
diff --git a/src/mainboard/asus/f2a85-m/Kconfig b/src/mainboard/asus/f2a85-m/Kconfig
index 3859156..2280451 100644
--- a/src/mainboard/asus/f2a85-m/Kconfig
+++ b/src/mainboard/asus/f2a85-m/Kconfig
@@ -22,7 +22,6 @@ if BOARD_ASUS_F2A85_M

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY15_TN
    select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
    select SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/mainboard/asus/k8v-x/Kconfig b/src/mainboard/asus/k8v-x/Kconfig
index 51426ac..0e829f0 100644
--- a/src/mainboard/asus/k8v-x/Kconfig
+++ b/src/mainboard/asus/k8v-x/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ASUS_K8V_X

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_754
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/asus/m2n-e/Kconfig b/src/mainboard/asus/m2n-e/Kconfig
index 959ad6c..5f7a39e 100644
--- a/src/mainboard/asus/m2n-e/Kconfig
+++ b/src/mainboard/asus/m2n-e/Kconfig
@@ -22,7 +22,6 @@ if BOARD_ASUS_M2N_E

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM2
    select DIMM_DDR2
    select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index f76ff7b..2c1331f 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ASUS_M2V_MX_SE

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM2
    select DIMM_DDR2
    select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/asus/m2v/Kconfig b/src/mainboard/asus/m2v/Kconfig
index 263bad9..0993096 100644
--- a/src/mainboard/asus/m2v/Kconfig
+++ b/src/mainboard/asus/m2v/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ASUS_M2V

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM2
    select DIMM_DDR2
    select QRANK_DIMM_SUPPORT
diff --git a/src/mainboard/asus/m4a78-em/Kconfig b/src/mainboard/asus/m4a78-em/Kconfig
index 197b3a0..744b881 100644
--- a/src/mainboard/asus/m4a78-em/Kconfig
+++ b/src/mainboard/asus/m4a78-em/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ASUS_M4A78_EM

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM3
    select DIMM_DDR2
    select NORTHBRIDGE_AMD_AMDFAM10
diff --git a/src/mainboard/asus/m4a785-m/Kconfig b/src/mainboard/asus/m4a785-m/Kconfig
index f6ba242..9e49ba0 100644
--- a/src/mainboard/asus/m4a785-m/Kconfig
+++ b/src/mainboard/asus/m4a785-m/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ASUS_M4A785M

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM3
    select DIMM_DDR2
    select NORTHBRIDGE_AMD_AMDFAM10
diff --git a/src/mainboard/asus/m4a785t-m/Kconfig b/src/mainboard/asus/m4a785t-m/Kconfig
index af4fb7c..1a709bc 100644
--- a/src/mainboard/asus/m4a785t-m/Kconfig
+++ b/src/mainboard/asus/m4a785t-m/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ASUS_M4A785TM

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM3
    select DIMM_DDR3
    select DIMM_REGISTERED
diff --git a/src/mainboard/asus/m5a88-v/Kconfig b/src/mainboard/asus/m5a88-v/Kconfig
index 7ff25d4..ae59599 100644
--- a/src/mainboard/asus/m5a88-v/Kconfig
+++ b/src/mainboard/asus/m5a88-v/Kconfig
@@ -2,7 +2,6 @@ if BOARD_ASUS_M5A88_V

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM3
    select DIMM_DDR3
    select DIMM_REGISTERED
diff --git a/src/mainboard/asus/mew-am/Kconfig b/src/mainboard/asus/mew-am/Kconfig
index ffd6e22..ad08c31 100644
--- a/src/mainboard/asus/mew-am/Kconfig
+++ b/src/mainboard/asus/mew-am/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ASUS_MEW_AM

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_PGA370
    select NORTHBRIDGE_INTEL_I82810
    select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/asus/mew-vm/Kconfig b/src/mainboard/asus/mew-vm/Kconfig
index 341c533..58910be 100644
--- a/src/mainboard/asus/mew-vm/Kconfig
+++ b/src/mainboard/asus/mew-vm/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ASUS_MEW_VM

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_PGA370
    select NORTHBRIDGE_INTEL_I82810
    select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig
index 54a1bae..b84a142 100644
--- a/src/mainboard/asus/p2b-d/Kconfig
+++ b/src/mainboard/asus/p2b-d/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ASUS_P2B_D

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig
index 652b31a..6a70e71 100644
--- a/src/mainboard/asus/p2b-ds/Kconfig
+++ b/src/mainboard/asus/p2b-ds/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ASUS_P2B_DS

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig
index e0554ca..07fa744 100644
--- a/src/mainboard/asus/p2b-f/Kconfig
+++ b/src/mainboard/asus/p2b-f/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ASUS_P2B_F

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/asus/p2b-ls/Kconfig b/src/mainboard/asus/p2b-ls/Kconfig
index f138463..3822eb7 100644
--- a/src/mainboard/asus/p2b-ls/Kconfig
+++ b/src/mainboard/asus/p2b-ls/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ASUS_P2B_LS

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig
index a57f7fb..b1b5597 100644
--- a/src/mainboard/asus/p2b/Kconfig
+++ b/src/mainboard/asus/p2b/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ASUS_P2B

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig
index d47dfdb..07cd91f 100644
--- a/src/mainboard/asus/p3b-f/Kconfig
+++ b/src/mainboard/asus/p3b-f/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ASUS_P3B_F

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/avalue/eax-785e/Kconfig b/src/mainboard/avalue/eax-785e/Kconfig
index abfaaec..3b96d19 100644
--- a/src/mainboard/avalue/eax-785e/Kconfig
+++ b/src/mainboard/avalue/eax-785e/Kconfig
@@ -2,7 +2,6 @@ if BOARD_AVALUE_EAX_785E

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM3
    select DIMM_DDR3
    select DIMM_REGISTERED
diff --git a/src/mainboard/axus/tc320/Kconfig b/src/mainboard/axus/tc320/Kconfig
index 868c8d1..97c33aa 100644
--- a/src/mainboard/axus/tc320/Kconfig
+++ b/src/mainboard/axus/tc320/Kconfig
@@ -20,7 +20,6 @@ if BOARD_AXUS_TC320

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_GX1
    select NORTHBRIDGE_AMD_GX1
    select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/azza/pt-6ibd/Kconfig b/src/mainboard/azza/pt-6ibd/Kconfig
index 50ac62b..8897102 100644
--- a/src/mainboard/azza/pt-6ibd/Kconfig
+++ b/src/mainboard/azza/pt-6ibd/Kconfig
@@ -20,7 +20,6 @@ if BOARD_AZZA_PT_6IBD

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/bachmann/ot200/Kconfig b/src/mainboard/bachmann/ot200/Kconfig
index 23b206e..baef807 100644
--- a/src/mainboard/bachmann/ot200/Kconfig
+++ b/src/mainboard/bachmann/ot200/Kconfig
@@ -2,7 +2,6 @@ if BOARD_BACHMANN_OT200

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/bcom/winnet100/Kconfig b/src/mainboard/bcom/winnet100/Kconfig
index d0a7807..503c92b 100644
--- a/src/mainboard/bcom/winnet100/Kconfig
+++ b/src/mainboard/bcom/winnet100/Kconfig
@@ -20,7 +20,6 @@ if BOARD_BCOM_WINNET100

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_GX1
    select NORTHBRIDGE_AMD_GX1
    select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/bcom/winnetp680/Kconfig b/src/mainboard/bcom/winnetp680/Kconfig
index 78e014e..f6a80af 100644
--- a/src/mainboard/bcom/winnetp680/Kconfig
+++ b/src/mainboard/bcom/winnetp680/Kconfig
@@ -2,7 +2,6 @@ if BOARD_BCOM_WINNETP680

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_VIA_C7
    select NORTHBRIDGE_VIA_CN700
    select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/biostar/m6tba/Kconfig b/src/mainboard/biostar/m6tba/Kconfig
index 8d86ab4..d83ceac 100644
--- a/src/mainboard/biostar/m6tba/Kconfig
+++ b/src/mainboard/biostar/m6tba/Kconfig
@@ -20,7 +20,6 @@ if BOARD_BIOSTAR_M6TBA

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig
index 502576c..a02fa12 100644
--- a/src/mainboard/broadcom/blast/Kconfig
+++ b/src/mainboard/broadcom/blast/Kconfig
@@ -2,7 +2,6 @@ if BOARD_BROADCOM_BLAST

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_BROADCOM_BCM5780
diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
index 1242a94..62f038c 100644
--- a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
+++ b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig
@@ -20,7 +20,6 @@ if BOARD_COMPAQ_DESKPRO_EN_SFF_P600

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/cubietech/cubieboard/Kconfig b/src/mainboard/cubietech/cubieboard/Kconfig
index 6cb84cf..176a3b3 100644
--- a/src/mainboard/cubietech/cubieboard/Kconfig
+++ b/src/mainboard/cubietech/cubieboard/Kconfig
@@ -2,7 +2,6 @@ if BOARD_CUBIETECH_CUBIEBOARD

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_ARMV7
    select CPU_ALLWINNER_A10
    select BOARD_ROMSIZE_KB_4096
    select DRIVER_XPOWERS_AXP209
diff --git a/src/mainboard/digitallogic/adl855pc/Kconfig b/src/mainboard/digitallogic/adl855pc/Kconfig
index a20a5c8..8c57a89 100644
--- a/src/mainboard/digitallogic/adl855pc/Kconfig
+++ b/src/mainboard/digitallogic/adl855pc/Kconfig
@@ -2,7 +2,6 @@ if BOARD_DIGITALLOGIC_ADL855PC

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MPGA479M
    select NORTHBRIDGE_INTEL_I855
    select SOUTHBRIDGE_INTEL_I82801DX
diff --git a/src/mainboard/digitallogic/msm586seg/Kconfig b/src/mainboard/digitallogic/msm586seg/Kconfig
index d54037a..4cd6f11 100644
--- a/src/mainboard/digitallogic/msm586seg/Kconfig
+++ b/src/mainboard/digitallogic/msm586seg/Kconfig
@@ -2,7 +2,6 @@ if BOARD_DIGITALLOGIC_MSM586SEG

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SC520
    select HAVE_PIRQ_TABLE
    select HAVE_OPTION_TABLE
diff --git a/src/mainboard/digitallogic/msm800sev/Kconfig b/src/mainboard/digitallogic/msm800sev/Kconfig
index 0b54906..bc8e3ac 100644
--- a/src/mainboard/digitallogic/msm800sev/Kconfig
+++ b/src/mainboard/digitallogic/msm800sev/Kconfig
@@ -2,7 +2,6 @@ if BOARD_DIGITALLOGIC_MSM800SEV

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/dmp/vortex86ex/Kconfig b/src/mainboard/dmp/vortex86ex/Kconfig
index 4b130b8..b164ca5 100644
--- a/src/mainboard/dmp/vortex86ex/Kconfig
+++ b/src/mainboard/dmp/vortex86ex/Kconfig
@@ -21,7 +21,6 @@ if BOARD_DMP_EX

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_DMP_VORTEX86EX
    select NORTHBRIDGE_DMP_VORTEX86EX
    select SOUTHBRIDGE_DMP_VORTEX86EX
diff --git a/src/mainboard/eaglelion/5bcm/Kconfig b/src/mainboard/eaglelion/5bcm/Kconfig
index cc507f0..3c0a800 100644
--- a/src/mainboard/eaglelion/5bcm/Kconfig
+++ b/src/mainboard/eaglelion/5bcm/Kconfig
@@ -20,7 +20,6 @@ if BOARD_EAGLELION_5BCM

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_GX1
    select NORTHBRIDGE_AMD_GX1
    select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/ecs/p6iwp-fe/Kconfig b/src/mainboard/ecs/p6iwp-fe/Kconfig
index c88d976..99170be 100644
--- a/src/mainboard/ecs/p6iwp-fe/Kconfig
+++ b/src/mainboard/ecs/p6iwp-fe/Kconfig
@@ -21,7 +21,6 @@ if BOARD_ECS_P6IWP_FE

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_PGA370
    select NORTHBRIDGE_INTEL_I82810
    select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/emulation/qemu-armv7/Kconfig b/src/mainboard/emulation/qemu-armv7/Kconfig
index 040ed9c..7865abd 100644
--- a/src/mainboard/emulation/qemu-armv7/Kconfig
+++ b/src/mainboard/emulation/qemu-armv7/Kconfig
@@ -23,7 +23,6 @@ if BOARD_EMULATION_QEMU_ARMV7

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_ARMV7
    select CPU_ARMLTD_CORTEX_A9
    select DRIVERS_UART_PL011
    select BOARD_ROMSIZE_KB_4096
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index b9df41e..0a750df 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -2,7 +2,6 @@ if BOARD_EMULATION_QEMU_X86_I440FX

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_QEMU_X86
    select SOUTHBRIDGE_INTEL_I82371EB
    select CACHE_AS_RAM
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index ad7576b..674d890 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -2,7 +2,6 @@ if BOARD_EMULATION_QEMU_X86_Q35

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_QEMU_X86
    select SOUTHBRIDGE_INTEL_I82801IX
    select IOAPIC_INTERRUPTS_ON_APIC_SERIAL_BUS
diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig
index db42233..3696b14 100644
--- a/src/mainboard/getac/p470/Kconfig
+++ b/src/mainboard/getac/p470/Kconfig
@@ -20,7 +20,6 @@ if BOARD_GETAC_P470

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MFCPGA478
    select NORTHBRIDGE_INTEL_I945
    select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/gigabyte/ga-6bxc/Kconfig b/src/mainboard/gigabyte/ga-6bxc/Kconfig
index 62625fb..8ea1abd 100644
--- a/src/mainboard/gigabyte/ga-6bxc/Kconfig
+++ b/src/mainboard/gigabyte/ga-6bxc/Kconfig
@@ -20,7 +20,6 @@ if BOARD_GIGABYTE_GA_6BXC

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/gigabyte/ga-6bxe/Kconfig b/src/mainboard/gigabyte/ga-6bxe/Kconfig
index 6e3462e..5b35e7d 100644
--- a/src/mainboard/gigabyte/ga-6bxe/Kconfig
+++ b/src/mainboard/gigabyte/ga-6bxe/Kconfig
@@ -21,7 +21,6 @@ if BOARD_GIGABYTE_GA_6BXE

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
index 9b0ef05..3fbb8cd 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GIGABYTE_GA_2761GXDK

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM2
    select DIMM_DDR2
    select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig
index 1ffa552..491df9c 100644
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/src/mainboard/gigabyte/m57sli/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GIGABYTE_M57SLI

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM2
    select DIMM_DDR2
    select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/gigabyte/ma785gm/Kconfig b/src/mainboard/gigabyte/ma785gm/Kconfig
index 7582320..94b449f 100644
--- a/src/mainboard/gigabyte/ma785gm/Kconfig
+++ b/src/mainboard/gigabyte/ma785gm/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GIGABYTE_MA785GM

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM3
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig
index 0ea4eb7..f98c0dd 100644
--- a/src/mainboard/gigabyte/ma785gmt/Kconfig
+++ b/src/mainboard/gigabyte/ma785gmt/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GIGABYTE_MA785GMT

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM3
    select DIMM_DDR3
    select DIMM_REGISTERED
diff --git a/src/mainboard/gigabyte/ma78gm/Kconfig b/src/mainboard/gigabyte/ma78gm/Kconfig
index d663eca..4a87aab 100644
--- a/src/mainboard/gigabyte/ma78gm/Kconfig
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GIGABYTE_MA78GM

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM2R2
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/gizmosphere/gizmo/Kconfig b/src/mainboard/gizmosphere/gizmo/Kconfig
index a4252e3..ff95b29 100755
--- a/src/mainboard/gizmosphere/gizmo/Kconfig
+++ b/src/mainboard/gizmosphere/gizmo/Kconfig
@@ -22,7 +22,6 @@ if BOARD_GIZMOSPHERE_GIZMO

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY14
    select NORTHBRIDGE_AMD_AGESA_FAMILY14
    select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/google/bolt/Kconfig b/src/mainboard/google/bolt/Kconfig
index 47d41ed..0910661 100644
--- a/src/mainboard/google/bolt/Kconfig
+++ b/src/mainboard/google/bolt/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GOOGLE_BOLT

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_HASWELL
    select SOUTHBRIDGE_INTEL_LYNXPOINT
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 51ce13b..1b7fe32 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GOOGLE_BUTTERFLY

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_IVYBRIDGE
    select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/google/falco/Kconfig b/src/mainboard/google/falco/Kconfig
index 5d19ffc..b369d62 100644
--- a/src/mainboard/google/falco/Kconfig
+++ b/src/mainboard/google/falco/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GOOGLE_FALCO

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_HASWELL
    select SOUTHBRIDGE_INTEL_LYNXPOINT
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index efe9519..fcecca0 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GOOGLE_LINK

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_IVYBRIDGE
    select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index d8a4e7a..23cea06 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GOOGLE_PARROT

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_IVYBRIDGE
    select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/google/peppy/Kconfig b/src/mainboard/google/peppy/Kconfig
index f401feb..204e28d 100644
--- a/src/mainboard/google/peppy/Kconfig
+++ b/src/mainboard/google/peppy/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GOOGLE_PEPPY

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_HASWELL
    select SOUTHBRIDGE_INTEL_LYNXPOINT
diff --git a/src/mainboard/google/pit/Kconfig b/src/mainboard/google/pit/Kconfig
index e7e9a31..861740f 100644
--- a/src/mainboard/google/pit/Kconfig
+++ b/src/mainboard/google/pit/Kconfig
@@ -21,7 +21,6 @@ if BOARD_GOOGLE_PIT

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_ARMV7
    select CPU_SAMSUNG_EXYNOS5420
    select EC_GOOGLE_CHROMEEC
    select EC_GOOGLE_CHROMEEC_SPI
diff --git a/src/mainboard/google/rambi/Kconfig b/src/mainboard/google/rambi/Kconfig
index 00af512..c0cb8ca 100644
--- a/src/mainboard/google/rambi/Kconfig
+++ b/src/mainboard/google/rambi/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GOOGLE_RAMBI

config BOARD_SPECIFIC_OPTIONS
    def_bool y
-	select ARCH_X86
    select SOC_INTEL_BAYTRAIL
    select EC_GOOGLE_CHROMEEC
    select EC_SOFTWARE_SYNC
diff --git a/src/mainboard/google/slippy/Kconfig b/src/mainboard/google/slippy/Kconfig
index ba6a6fe..3c34938 100644
--- a/src/mainboard/google/slippy/Kconfig
+++ b/src/mainboard/google/slippy/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GOOGLE_SLIPPY

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_HASWELL
    select SOUTHBRIDGE_INTEL_LYNXPOINT
diff --git a/src/mainboard/google/snow/Kconfig b/src/mainboard/google/snow/Kconfig
index e808eb8..14e26a9 100644
--- a/src/mainboard/google/snow/Kconfig
+++ b/src/mainboard/google/snow/Kconfig
@@ -21,7 +21,6 @@ if BOARD_GOOGLE_SNOW

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_ARMV7
    select CPU_SAMSUNG_EXYNOS5250
    select EC_GOOGLE_CHROMEEC
    select EC_GOOGLE_CHROMEEC_I2C
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index d5e265f..e683455 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GOOGLE_STOUT

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_IVYBRIDGE
    select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/hp/dl145_g1/Kconfig b/src/mainboard/hp/dl145_g1/Kconfig
index a169b88..0c6d642 100644
--- a/src/mainboard/hp/dl145_g1/Kconfig
+++ b/src/mainboard/hp/dl145_g1/Kconfig
@@ -2,7 +2,6 @@ if BOARD_HP_DL145_G1

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8131
diff --git a/src/mainboard/hp/dl145_g3/Kconfig b/src/mainboard/hp/dl145_g3/Kconfig
index be3f009..9885e2b 100644
--- a/src/mainboard/hp/dl145_g3/Kconfig
+++ b/src/mainboard/hp/dl145_g3/Kconfig
@@ -2,7 +2,6 @@ if BOARD_HP_DL145_G3

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/hp/dl165_g6_fam10/Kconfig b/src/mainboard/hp/dl165_g6_fam10/Kconfig
index b72b8dd..ba8c799 100644
--- a/src/mainboard/hp/dl165_g6_fam10/Kconfig
+++ b/src/mainboard/hp/dl165_g6_fam10/Kconfig
@@ -2,7 +2,6 @@ if BOARD_HP_DL165_G6_FAM10

config BOARD_SPECIFIC_OPTIONS # dummy
         def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F_1207
    select NORTHBRIDGE_AMD_AMDFAM10
    select SOUTHBRIDGE_BROADCOM_BCM21000
diff --git a/src/mainboard/hp/e_vectra_p2706t/Kconfig b/src/mainboard/hp/e_vectra_p2706t/Kconfig
index e78238c..c5aa340 100644
--- a/src/mainboard/hp/e_vectra_p2706t/Kconfig
+++ b/src/mainboard/hp/e_vectra_p2706t/Kconfig
@@ -24,7 +24,6 @@ if BOARD_HP_E_VECTRA_P2706T

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_PGA370
    select NORTHBRIDGE_INTEL_I82810
    select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
index d6cdb10..202f831 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
+++ b/src/mainboard/hp/pavilion_m6_1035dx/Kconfig
@@ -21,7 +21,6 @@ if BOARD_HP_PAVILION_M6_1035DX

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY15_TN
    select NORTHBRIDGE_AMD_AGESA_FAMILY15_TN
    select SOUTHBRIDGE_AMD_AGESA_HUDSON
diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig
index 72b916f..8975be2 100644
--- a/src/mainboard/ibase/mb899/Kconfig
+++ b/src/mainboard/ibase/mb899/Kconfig
@@ -2,7 +2,6 @@ if BOARD_IBASE_MB899

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MFCPGA478
    select NORTHBRIDGE_INTEL_I945
    select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig
index 0a8442b..d002dce 100644
--- a/src/mainboard/ibm/e325/Kconfig
+++ b/src/mainboard/ibm/e325/Kconfig
@@ -2,7 +2,6 @@ if BOARD_IBM_E325

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig
index 2016ef9..5632c30 100644
--- a/src/mainboard/ibm/e326/Kconfig
+++ b/src/mainboard/ibm/e326/Kconfig
@@ -2,7 +2,6 @@ if BOARD_IBM_E326

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/iei/juki-511p/Kconfig b/src/mainboard/iei/juki-511p/Kconfig
index 03dffff..e17d69a 100644
--- a/src/mainboard/iei/juki-511p/Kconfig
+++ b/src/mainboard/iei/juki-511p/Kconfig
@@ -20,7 +20,6 @@ if BOARD_IEI_JUKI_511P || BOARD_IEI_ROCKY_512

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_GX1
    select NORTHBRIDGE_AMD_GX1
    select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/iei/kino-780am2-fam10/Kconfig b/src/mainboard/iei/kino-780am2-fam10/Kconfig
index 62c8671..05abdf6 100644
--- a/src/mainboard/iei/kino-780am2-fam10/Kconfig
+++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig
@@ -2,7 +2,6 @@ if BOARD_IEI_KINO_FAM10

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM2R2
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/iei/nova4899r/Kconfig b/src/mainboard/iei/nova4899r/Kconfig
index 36db67b..8d0a9a4 100644
--- a/src/mainboard/iei/nova4899r/Kconfig
+++ b/src/mainboard/iei/nova4899r/Kconfig
@@ -20,7 +20,6 @@ if BOARD_IEI_NOVA_4899R

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_GX1
    select NORTHBRIDGE_AMD_GX1
    select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
index 69e106e..74a3c10 100644
--- a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
+++ b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig
@@ -2,7 +2,6 @@ if BOARD_IEI_PCISA_LX_800_R10

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/iei/pm-lx-800-r11/Kconfig b/src/mainboard/iei/pm-lx-800-r11/Kconfig
index e443c6c..61c2772 100644
--- a/src/mainboard/iei/pm-lx-800-r11/Kconfig
+++ b/src/mainboard/iei/pm-lx-800-r11/Kconfig
@@ -23,7 +23,6 @@ if BOARD_IEI_PM_LX_800_R11

config BOARD_SPECIFIC_OPTIONS
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/iei/pm-lx2-800-r10/Kconfig b/src/mainboard/iei/pm-lx2-800-r10/Kconfig
index 1485c94..8e92e69 100644
--- a/src/mainboard/iei/pm-lx2-800-r10/Kconfig
+++ b/src/mainboard/iei/pm-lx2-800-r10/Kconfig
@@ -23,7 +23,6 @@ if BOARD_IEI_PM_LX2_800_R10

config BOARD_SPECIFIC_OPTIONS
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/iei/rocky-512/Kconfig b/src/mainboard/iei/rocky-512/Kconfig
index 0d6ac38..864da86 100644
--- a/src/mainboard/iei/rocky-512/Kconfig
+++ b/src/mainboard/iei/rocky-512/Kconfig
@@ -1,7 +1,6 @@
 if BOARD_IEI_ROCKY_512

# Dummy for abuild
-#select ARCH_X86

config MAINBOARD_PART_NUMBER
    string
diff --git a/src/mainboard/intel/baskingridge/Kconfig b/src/mainboard/intel/baskingridge/Kconfig
index 710094e..b52df97 100644
--- a/src/mainboard/intel/baskingridge/Kconfig
+++ b/src/mainboard/intel/baskingridge/Kconfig
@@ -2,7 +2,6 @@ if BOARD_INTEL_BASKING_RIDGE

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_HASWELL
    select SOUTHBRIDGE_INTEL_LYNXPOINT
diff --git a/src/mainboard/intel/cougar_canyon2/Kconfig b/src/mainboard/intel/cougar_canyon2/Kconfig
index 61f1c6d..774bbb8 100644
--- a/src/mainboard/intel/cougar_canyon2/Kconfig
+++ b/src/mainboard/intel/cougar_canyon2/Kconfig
@@ -2,7 +2,6 @@ if BOARD_INTEL_COUGAR_CANYON2

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_FSP_IVYBRIDGE
    select SOUTHBRIDGE_INTEL_FSP_BD82X6X
diff --git a/src/mainboard/intel/d810e2cb/Kconfig b/src/mainboard/intel/d810e2cb/Kconfig
index 91edf33..85b0e6c 100644
--- a/src/mainboard/intel/d810e2cb/Kconfig
+++ b/src/mainboard/intel/d810e2cb/Kconfig
@@ -20,7 +20,6 @@ if BOARD_INTEL_D810E2CB

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_FC_PGA370
    select NORTHBRIDGE_INTEL_I82810
    select SOUTHBRIDGE_INTEL_I82801BX
diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index b676eb6..490aa80 100644
--- a/src/mainboard/intel/d945gclf/Kconfig
+++ b/src/mainboard/intel/d945gclf/Kconfig
@@ -20,7 +20,6 @@ if BOARD_INTEL_D945GCLF

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_441
    select NORTHBRIDGE_INTEL_I945
    select NORTHBRIDGE_INTEL_SUBTYPE_I945GC
diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig
index e74705b..bc0799c 100644
--- a/src/mainboard/intel/eagleheights/Kconfig
+++ b/src/mainboard/intel/eagleheights/Kconfig
@@ -2,7 +2,6 @@ if BOARD_INTEL_EAGLEHEIGHTS

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_BGA956
    select NORTHBRIDGE_INTEL_I3100
    select SOUTHBRIDGE_INTEL_I3100
diff --git a/src/mainboard/intel/emeraldlake2/Kconfig b/src/mainboard/intel/emeraldlake2/Kconfig
index 01082d4..77aa910 100644
--- a/src/mainboard/intel/emeraldlake2/Kconfig
+++ b/src/mainboard/intel/emeraldlake2/Kconfig
@@ -2,7 +2,6 @@ if BOARD_INTEL_EMERALDLAKE2

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_IVYBRIDGE
    select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/intel/jarrell/Kconfig b/src/mainboard/intel/jarrell/Kconfig
index 2a62777..6ecbc87 100644
--- a/src/mainboard/intel/jarrell/Kconfig
+++ b/src/mainboard/intel/jarrell/Kconfig
@@ -2,7 +2,6 @@ if BOARD_INTEL_JARRELL

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MPGA604
    select NORTHBRIDGE_INTEL_E7520
    select SOUTHBRIDGE_INTEL_PXHD
diff --git a/src/mainboard/intel/mtarvon/Kconfig b/src/mainboard/intel/mtarvon/Kconfig
index af40cad..4097fa7 100644
--- a/src/mainboard/intel/mtarvon/Kconfig
+++ b/src/mainboard/intel/mtarvon/Kconfig
@@ -2,7 +2,6 @@ if BOARD_INTEL_MTARVON

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MPGA479M
    select NORTHBRIDGE_INTEL_I3100
    select SOUTHBRIDGE_INTEL_I3100
diff --git a/src/mainboard/intel/truxton/Kconfig b/src/mainboard/intel/truxton/Kconfig
index 5f7de08..5aa4b57 100644
--- a/src/mainboard/intel/truxton/Kconfig
+++ b/src/mainboard/intel/truxton/Kconfig
@@ -2,7 +2,6 @@ if BOARD_INTEL_TRUXTON

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_EP80579
    select NORTHBRIDGE_INTEL_I3100
    select SOUTHBRIDGE_INTEL_I3100
diff --git a/src/mainboard/intel/wtm2/Kconfig b/src/mainboard/intel/wtm2/Kconfig
index 00ea604..6fd3813 100644
--- a/src/mainboard/intel/wtm2/Kconfig
+++ b/src/mainboard/intel/wtm2/Kconfig
@@ -2,7 +2,6 @@ if BOARD_INTEL_WTM2

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_HASWELL
    select SOUTHBRIDGE_INTEL_LYNXPOINT
diff --git a/src/mainboard/intel/xe7501devkit/Kconfig b/src/mainboard/intel/xe7501devkit/Kconfig
index 276b1f7..923d39a 100644
--- a/src/mainboard/intel/xe7501devkit/Kconfig
+++ b/src/mainboard/intel/xe7501devkit/Kconfig
@@ -2,7 +2,6 @@ if BOARD_INTEL_XE7501DEVKIT

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MPGA604
    select NORTHBRIDGE_INTEL_E7501
    select SOUTHBRIDGE_INTEL_I82870
diff --git a/src/mainboard/iwave/iWRainbowG6/Kconfig b/src/mainboard/iwave/iWRainbowG6/Kconfig
index c6c15d5..e29615e 100644
--- a/src/mainboard/iwave/iWRainbowG6/Kconfig
+++ b/src/mainboard/iwave/iWRainbowG6/Kconfig
@@ -3,7 +3,6 @@ if BOARD_IWAVE_RAINBOW_G6
 # TODO: move options to chipset components as appropriate
 config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_441
    select NORTHBRIDGE_INTEL_SCH
    select SOUTHBRIDGE_INTEL_SCH
diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig
index 6ccee76..11b11b9 100644
--- a/src/mainboard/iwill/dk8_htx/Kconfig
+++ b/src/mainboard/iwill/dk8_htx/Kconfig
@@ -2,7 +2,6 @@ if BOARD_IWILL_DK8_HTX

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig
index d7fefd8..c270f6f 100644
--- a/src/mainboard/iwill/dk8s2/Kconfig
+++ b/src/mainboard/iwill/dk8s2/Kconfig
@@ -2,7 +2,6 @@ if BOARD_IWILL_DK8S2

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig
index bdbeb69..8457944 100644
--- a/src/mainboard/iwill/dk8x/Kconfig
+++ b/src/mainboard/iwill/dk8x/Kconfig
@@ -2,7 +2,6 @@ if BOARD_IWILL_DK8X

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/jetway/j7f2/Kconfig b/src/mainboard/jetway/j7f2/Kconfig
index 811b37e..d2b413b 100644
--- a/src/mainboard/jetway/j7f2/Kconfig
+++ b/src/mainboard/jetway/j7f2/Kconfig
@@ -2,7 +2,6 @@ if BOARD_JETWAY_J7F2 || BOARD_JETWAY_J7F4K1G2E || BOARD_JETWAY_J7F4K1G5D

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_VIA_C7
    select NORTHBRIDGE_VIA_CN700
    select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/jetway/j7f4k1g2e/Kconfig b/src/mainboard/jetway/j7f4k1g2e/Kconfig
index b46e29e..8c8bbaf 100644
--- a/src/mainboard/jetway/j7f4k1g2e/Kconfig
+++ b/src/mainboard/jetway/j7f4k1g2e/Kconfig
@@ -1,7 +1,6 @@
 if BOARD_JETWAY_J7F4K1G2E

# Dummy for abuild
-#select ARCH_X86

config MAINBOARD_PART_NUMBER
    string
diff --git a/src/mainboard/jetway/j7f4k1g5d/Kconfig b/src/mainboard/jetway/j7f4k1g5d/Kconfig
index edd75f8..d59e703 100644
--- a/src/mainboard/jetway/j7f4k1g5d/Kconfig
+++ b/src/mainboard/jetway/j7f4k1g5d/Kconfig
@@ -1,7 +1,6 @@
 if BOARD_JETWAY_J7F4K1G5D

# Dummy for abuild
-#select ARCH_X86

config MAINBOARD_PART_NUMBER
    string
diff --git a/src/mainboard/jetway/nf81-t56n-lf/Kconfig b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
index 85d7558..0f85386 100644
--- a/src/mainboard/jetway/nf81-t56n-lf/Kconfig
+++ b/src/mainboard/jetway/nf81-t56n-lf/Kconfig
@@ -22,7 +22,6 @@ if BOARD_JETWAY_NF81_T56N_LF

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY14
    select NORTHBRIDGE_AMD_AGESA_FAMILY14
    select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/jetway/pa78vm5/Kconfig b/src/mainboard/jetway/pa78vm5/Kconfig
index 01c4a59..106b610 100644
--- a/src/mainboard/jetway/pa78vm5/Kconfig
+++ b/src/mainboard/jetway/pa78vm5/Kconfig
@@ -2,7 +2,6 @@ if BOARD_JETWAY_PA78VM5

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM2R2
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index 29d4da4..f5d4f8c 100644
--- a/src/mainboard/kontron/986lcd-m/Kconfig
+++ b/src/mainboard/kontron/986lcd-m/Kconfig
@@ -2,7 +2,6 @@ if BOARD_KONTRON_986LCD_M

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MFCPGA478
    select NORTHBRIDGE_INTEL_I945
    select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig
index b0b0195..2891736 100644
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -2,7 +2,6 @@ if BOARD_KONTRON_KT690

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_S1G1
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_RS690
diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig
index e9d1ce7..96153f7 100644
--- a/src/mainboard/kontron/ktqm77/Kconfig
+++ b/src/mainboard/kontron/ktqm77/Kconfig
@@ -2,7 +2,6 @@ if BOARD_KONTRON_KTQM77

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_IVYBRIDGE
    select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/lanner/em8510/Kconfig b/src/mainboard/lanner/em8510/Kconfig
index 1a306cf..e042e81 100644
--- a/src/mainboard/lanner/em8510/Kconfig
+++ b/src/mainboard/lanner/em8510/Kconfig
@@ -2,7 +2,6 @@ if BOARD_LANNER_EM8510

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MPGA479M
    select NORTHBRIDGE_INTEL_I855
    select SOUTHBRIDGE_INTEL_I82801DX
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index 701b2ed..99b5849 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -2,7 +2,6 @@ if BOARD_LENOVO_T530

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_IVYBRIDGE
    select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
index 6a743d5..cb2bb39 100644
--- a/src/mainboard/lenovo/t60/Kconfig
+++ b/src/mainboard/lenovo/t60/Kconfig
@@ -2,7 +2,6 @@ if BOARD_LENOVO_T60

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MFCPGA478
    select NORTHBRIDGE_INTEL_I945
    select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/lenovo/x201/Kconfig b/src/mainboard/lenovo/x201/Kconfig
index 860a953..ff9f0ae 100644
--- a/src/mainboard/lenovo/x201/Kconfig
+++ b/src/mainboard/lenovo/x201/Kconfig
@@ -2,7 +2,6 @@ if BOARD_LENOVO_X201

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select NORTHBRIDGE_INTEL_NEHALEM
    select SOUTHBRIDGE_INTEL_IBEXPEAK
    select EC_LENOVO_PMH7
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index cd1f761..2ce51a8 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -2,7 +2,6 @@ if BOARD_LENOVO_X230

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_RPGA989
    select NORTHBRIDGE_INTEL_IVYBRIDGE
    select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/lenovo/x60/Kconfig b/src/mainboard/lenovo/x60/Kconfig
index 7ed2665..1158046 100644
--- a/src/mainboard/lenovo/x60/Kconfig
+++ b/src/mainboard/lenovo/x60/Kconfig
@@ -2,7 +2,6 @@ if BOARD_LENOVO_X60

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MFCPGA478
    select NORTHBRIDGE_INTEL_I945
    select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/linutop/linutop1/Kconfig b/src/mainboard/linutop/linutop1/Kconfig
index feb5f78..c8f9a24 100644
--- a/src/mainboard/linutop/linutop1/Kconfig
+++ b/src/mainboard/linutop/linutop1/Kconfig
@@ -1,7 +1,6 @@
 if BOARD_LINUTOP_LINUTOP1

# Dummy for abuild
-#select ARCH_X86

config MAINBOARD_PART_NUMBER
    string
diff --git a/src/mainboard/lippert/frontrunner-af/Kconfig b/src/mainboard/lippert/frontrunner-af/Kconfig
index f598882..7dd71e9 100644
--- a/src/mainboard/lippert/frontrunner-af/Kconfig
+++ b/src/mainboard/lippert/frontrunner-af/Kconfig
@@ -21,7 +21,6 @@ if BOARD_LIPPERT_FRONTRUNNER_AF

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY14
    select NORTHBRIDGE_AMD_AGESA_FAMILY14
    select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/lippert/frontrunner/Kconfig b/src/mainboard/lippert/frontrunner/Kconfig
index ba1d5f1..fdba7ba 100644
--- a/src/mainboard/lippert/frontrunner/Kconfig
+++ b/src/mainboard/lippert/frontrunner/Kconfig
@@ -2,7 +2,6 @@ if BOARD_LIPPERT_FRONTRUNNER

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_GX2
    select NORTHBRIDGE_AMD_GX2
    select SOUTHBRIDGE_AMD_CS5535
diff --git a/src/mainboard/lippert/hurricane-lx/Kconfig b/src/mainboard/lippert/hurricane-lx/Kconfig
index 64e1631..4e41bbd 100644
--- a/src/mainboard/lippert/hurricane-lx/Kconfig
+++ b/src/mainboard/lippert/hurricane-lx/Kconfig
@@ -2,7 +2,6 @@ if BOARD_LIPPERT_HURRICANE_LX

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/lippert/literunner-lx/Kconfig b/src/mainboard/lippert/literunner-lx/Kconfig
index c4684c9..c3aab0e 100644
--- a/src/mainboard/lippert/literunner-lx/Kconfig
+++ b/src/mainboard/lippert/literunner-lx/Kconfig
@@ -2,7 +2,6 @@ if BOARD_LIPPERT_LITERUNNER_LX

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/lippert/roadrunner-lx/Kconfig b/src/mainboard/lippert/roadrunner-lx/Kconfig
index f5ec9b9..051713a 100644
--- a/src/mainboard/lippert/roadrunner-lx/Kconfig
+++ b/src/mainboard/lippert/roadrunner-lx/Kconfig
@@ -2,7 +2,6 @@ if BOARD_LIPPERT_ROADRUNNER_LX

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/lippert/spacerunner-lx/Kconfig b/src/mainboard/lippert/spacerunner-lx/Kconfig
index c4a2ce8..65645fd 100644
--- a/src/mainboard/lippert/spacerunner-lx/Kconfig
+++ b/src/mainboard/lippert/spacerunner-lx/Kconfig
@@ -2,7 +2,6 @@ if BOARD_LIPPERT_SPACERUNNER_LX

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/lippert/toucan-af/Kconfig b/src/mainboard/lippert/toucan-af/Kconfig
index 7660acb..63200b3 100644
--- a/src/mainboard/lippert/toucan-af/Kconfig
+++ b/src/mainboard/lippert/toucan-af/Kconfig
@@ -21,7 +21,6 @@ if BOARD_LIPPERT_TOUCAN_AF

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY14
    select NORTHBRIDGE_AMD_AGESA_FAMILY14
    select SOUTHBRIDGE_AMD_CIMX_SB800
diff --git a/src/mainboard/mitac/6513wu/Kconfig b/src/mainboard/mitac/6513wu/Kconfig
index e552982..6228a6e 100644
--- a/src/mainboard/mitac/6513wu/Kconfig
+++ b/src/mainboard/mitac/6513wu/Kconfig
@@ -20,7 +20,6 @@ if BOARD_MITAC_6513WU

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_PGA370
    select NORTHBRIDGE_INTEL_I82810
    select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/msi/ms6119/Kconfig b/src/mainboard/msi/ms6119/Kconfig
index 7705522..00ed0d9 100644
--- a/src/mainboard/msi/ms6119/Kconfig
+++ b/src/mainboard/msi/ms6119/Kconfig
@@ -20,7 +20,6 @@ if BOARD_MSI_MS_6119

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/msi/ms6147/Kconfig b/src/mainboard/msi/ms6147/Kconfig
index 9b51a49..fa4af80 100644
--- a/src/mainboard/msi/ms6147/Kconfig
+++ b/src/mainboard/msi/ms6147/Kconfig
@@ -20,7 +20,6 @@ if BOARD_MSI_MS_6147

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/msi/ms6156/Kconfig b/src/mainboard/msi/ms6156/Kconfig
index 58654f6..840751c 100644
--- a/src/mainboard/msi/ms6156/Kconfig
+++ b/src/mainboard/msi/ms6156/Kconfig
@@ -20,7 +20,6 @@ if BOARD_MSI_MS_6156

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/msi/ms6178/Kconfig b/src/mainboard/msi/ms6178/Kconfig
index 4baee5e..cc70e76 100644
--- a/src/mainboard/msi/ms6178/Kconfig
+++ b/src/mainboard/msi/ms6178/Kconfig
@@ -20,7 +20,6 @@ if BOARD_MSI_MS_6178

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_PGA370
    select NORTHBRIDGE_INTEL_I82810
    select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig
index 76b6625..f2cfd9a 100644
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/src/mainboard/msi/ms7135/Kconfig
@@ -2,7 +2,6 @@ if BOARD_MSI_MS7135

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_754
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig
index 27bd3e5..c8ff25e 100644
--- a/src/mainboard/msi/ms7260/Kconfig
+++ b/src/mainboard/msi/ms7260/Kconfig
@@ -2,7 +2,6 @@ if BOARD_MSI_MS7260

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_AM2
    select DIMM_DDR2
    select NORTHBRIDGE_AMD_AMDK8
diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig
index 7823d56..0b0ff1c 100644
--- a/src/mainboard/msi/ms9185/Kconfig
+++ b/src/mainboard/msi/ms9185/Kconfig
@@ -2,7 +2,6 @@ if BOARD_MSI_MS9185

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig
index 1359a89..76903e2 100644
--- a/src/mainboard/msi/ms9282/Kconfig
+++ b/src/mainboard/msi/ms9282/Kconfig
@@ -2,7 +2,6 @@ if BOARD_MSI_MS9282

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index 42ceff4..e305551 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -2,7 +2,6 @@ if BOARD_MSI_MS9652_FAM10

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F_1207
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/nec/powermate2000/Kconfig b/src/mainboard/nec/powermate2000/Kconfig
index 82c2f9d..6fddcc1 100644
--- a/src/mainboard/nec/powermate2000/Kconfig
+++ b/src/mainboard/nec/powermate2000/Kconfig
@@ -20,7 +20,6 @@ if BOARD_NEC_POWERMATE_2000

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_PGA370
    select NORTHBRIDGE_INTEL_I82810
    select SOUTHBRIDGE_INTEL_I82801AX
diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig
index 94de54b..e3d5698 100644
--- a/src/mainboard/newisys/khepri/Kconfig
+++ b/src/mainboard/newisys/khepri/Kconfig
@@ -2,7 +2,6 @@ if BOARD_NEWISYS_KHEPRI

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/nokia/ip530/Kconfig b/src/mainboard/nokia/ip530/Kconfig
index 58d6d37..bb72688 100644
--- a/src/mainboard/nokia/ip530/Kconfig
+++ b/src/mainboard/nokia/ip530/Kconfig
@@ -20,7 +20,6 @@ if BOARD_NOKIA_IP530

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_PGA370
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/nvidia/l1_2pvv/Kconfig b/src/mainboard/nvidia/l1_2pvv/Kconfig
index e04caaa..4fe3b4d 100644
--- a/src/mainboard/nvidia/l1_2pvv/Kconfig
+++ b/src/mainboard/nvidia/l1_2pvv/Kconfig
@@ -2,7 +2,6 @@ if BOARD_NVIDIA_L1_2PVV

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/pcengines/alix1c/Kconfig b/src/mainboard/pcengines/alix1c/Kconfig
index fab8710..bbd78a3 100644
--- a/src/mainboard/pcengines/alix1c/Kconfig
+++ b/src/mainboard/pcengines/alix1c/Kconfig
@@ -2,7 +2,6 @@ if BOARD_PCENGINES_ALIX1C

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/pcengines/alix2c/Kconfig b/src/mainboard/pcengines/alix2c/Kconfig
index e2ff77c..8bed484 100644
--- a/src/mainboard/pcengines/alix2c/Kconfig
+++ b/src/mainboard/pcengines/alix2c/Kconfig
@@ -1,7 +1,6 @@
 if BOARD_PCENGINES_ALIX2C

# Dummy for abuild
-#select ARCH_X86

config MAINBOARD_PART_NUMBER
    string
diff --git a/src/mainboard/pcengines/alix2d/Kconfig b/src/mainboard/pcengines/alix2d/Kconfig
index 7ea32c3..a350e11 100644
--- a/src/mainboard/pcengines/alix2d/Kconfig
+++ b/src/mainboard/pcengines/alix2d/Kconfig
@@ -2,7 +2,6 @@ if BOARD_PCENGINES_ALIX2C || BOARD_PCENGINES_ALIX2D || BOARD_PCENGINES_ALIX6

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/pcengines/alix6/Kconfig b/src/mainboard/pcengines/alix6/Kconfig
index 4329f19..41b9cf4 100644
--- a/src/mainboard/pcengines/alix6/Kconfig
+++ b/src/mainboard/pcengines/alix6/Kconfig
@@ -1,7 +1,6 @@
 if BOARD_PCENGINES_ALIX6

# Dummy for abuild
-#select ARCH_X86

config MAINBOARD_PART_NUMBER
    string
diff --git a/src/mainboard/rca/rm4100/Kconfig b/src/mainboard/rca/rm4100/Kconfig
index ecbd2cc..975977f 100644
--- a/src/mainboard/rca/rm4100/Kconfig
+++ b/src/mainboard/rca/rm4100/Kconfig
@@ -2,7 +2,6 @@ if BOARD_RCA_RM4100

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MFCBGA479
    select NORTHBRIDGE_INTEL_I82830
    select SOUTHBRIDGE_INTEL_I82801DX
diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig
index 365980e..94290d5 100644
--- a/src/mainboard/roda/rk886ex/Kconfig
+++ b/src/mainboard/roda/rk886ex/Kconfig
@@ -2,7 +2,6 @@ if BOARD_RODA_RK886EX

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MFCPGA478
    select NORTHBRIDGE_INTEL_I945
    select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/roda/rk9/Kconfig b/src/mainboard/roda/rk9/Kconfig
index 2c1944a..67fc88a 100644
--- a/src/mainboard/roda/rk9/Kconfig
+++ b/src/mainboard/roda/rk9/Kconfig
@@ -2,7 +2,6 @@ if BOARD_RODA_RK9

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_BGA956
    select NORTHBRIDGE_INTEL_GM45
    select SOUTHBRIDGE_INTEL_I82801IX
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 500427a..9c8c466 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SAMSUNG_LUMPY

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select BOARD_ROMSIZE_KB_8192
    select MAINBOARD_HAS_CHROMEOS
    select CPU_INTEL_SOCKET_RPGA989
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index e1e0cfa..e38efe0 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SAMSUNG_STUMPY

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select BOARD_ROMSIZE_KB_8192
    select MAINBOARD_HAS_CHROMEOS
    select CPU_INTEL_SOCKET_RPGA989
diff --git a/src/mainboard/siemens/sitemp_g1p1/Kconfig b/src/mainboard/siemens/sitemp_g1p1/Kconfig
index 8d0ff80..dff329f 100644
--- a/src/mainboard/siemens/sitemp_g1p1/Kconfig
+++ b/src/mainboard/siemens/sitemp_g1p1/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SIEMENS_SITEMP_G1P1

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_S1G1
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_RS690
diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
index 096aa7c..a268bad 100644
--- a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
+++ b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig
@@ -20,7 +20,6 @@ if BOARD_SOYO_SY_6BA_PLUS_III

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig
index 80e08c4..f95fc8c 100644
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/src/mainboard/sunw/ultra40/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SUNW_ULTRA40

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index bfcb724..62ae51a 100644
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SUPERMICRO_H8DME

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig
index 546dfa5..32f0391 100644
--- a/src/mainboard/supermicro/h8dmr/Kconfig
+++ b/src/mainboard/supermicro/h8dmr/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SUPERMICRO_H8DMR

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index 2f48b32..e1ce4e7 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SUPERMICRO_H8DMR_FAM10

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F_1207
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/supermicro/h8qgi/Kconfig b/src/mainboard/supermicro/h8qgi/Kconfig
index 2ff782a..2ca73be 100644
--- a/src/mainboard/supermicro/h8qgi/Kconfig
+++ b/src/mainboard/supermicro/h8qgi/Kconfig
@@ -21,7 +21,6 @@ if BOARD_SUPERMICRO_H8QGI

config BOARD_SPECIFIC_OPTIONS
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY15
    select CPU_AMD_SOCKET_G34
    select NORTHBRIDGE_AMD_AGESA_FAMILY15
diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig
index 27172ff..8d91f6f 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SUPERMICRO_H8QME_FAM10

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F_1207
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/supermicro/h8scm/Kconfig b/src/mainboard/supermicro/h8scm/Kconfig
index 7260f99..4a58d04 100644
--- a/src/mainboard/supermicro/h8scm/Kconfig
+++ b/src/mainboard/supermicro/h8scm/Kconfig
@@ -21,7 +21,6 @@ if BOARD_SUPERMICRO_H8SCM

config BOARD_SPECIFIC_OPTIONS
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY15
    select CPU_AMD_SOCKET_C32
    select NORTHBRIDGE_AMD_AGESA_FAMILY15
diff --git a/src/mainboard/supermicro/h8scm_fam10/Kconfig b/src/mainboard/supermicro/h8scm_fam10/Kconfig
index 87cfc73..de48dba 100644
--- a/src/mainboard/supermicro/h8scm_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8scm_fam10/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SUPERMICRO_H9SCM_FAM10

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_C32_NON_AGESA
    select DIMM_DDR3
    select DIMM_REGISTERED
diff --git a/src/mainboard/supermicro/x6dai_g/Kconfig b/src/mainboard/supermicro/x6dai_g/Kconfig
index 90a800c..4999320 100644
--- a/src/mainboard/supermicro/x6dai_g/Kconfig
+++ b/src/mainboard/supermicro/x6dai_g/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SUPERMICRO_X6DAI_G

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MPGA604
    select NORTHBRIDGE_INTEL_E7525
    select SOUTHBRIDGE_INTEL_ESB6300
diff --git a/src/mainboard/supermicro/x6dhe_g/Kconfig b/src/mainboard/supermicro/x6dhe_g/Kconfig
index ab8d00b..d520415 100644
--- a/src/mainboard/supermicro/x6dhe_g/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SUPERMICRO_X6DHE_G

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MPGA604
    select NORTHBRIDGE_INTEL_E7520
    select SOUTHBRIDGE_INTEL_ESB6300
diff --git a/src/mainboard/supermicro/x6dhe_g2/Kconfig b/src/mainboard/supermicro/x6dhe_g2/Kconfig
index b4630fe..159c9c3 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Kconfig
+++ b/src/mainboard/supermicro/x6dhe_g2/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SUPERMICRO_X6DHE_G2

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MPGA604
    select NORTHBRIDGE_INTEL_E7520
    select SOUTHBRIDGE_INTEL_I82801EX
diff --git a/src/mainboard/supermicro/x6dhr_ig/Kconfig b/src/mainboard/supermicro/x6dhr_ig/Kconfig
index 0b25fcd..e02b2dd 100644
--- a/src/mainboard/supermicro/x6dhr_ig/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SUPERMICRO_X6DHR_IG

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MPGA604
    select NORTHBRIDGE_INTEL_E7520
    select SOUTHBRIDGE_INTEL_I82801EX
diff --git a/src/mainboard/supermicro/x6dhr_ig2/Kconfig b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
index 70df01a..9c8e4a6 100644
--- a/src/mainboard/supermicro/x6dhr_ig2/Kconfig
+++ b/src/mainboard/supermicro/x6dhr_ig2/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SUPERMICRO_X6DHR_IG2

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MPGA604
    select NORTHBRIDGE_INTEL_E7520
    select SOUTHBRIDGE_INTEL_I82801EX
diff --git a/src/mainboard/supermicro/x7db8/Kconfig b/src/mainboard/supermicro/x7db8/Kconfig
index 7becacb..f5b0e11 100644
--- a/src/mainboard/supermicro/x7db8/Kconfig
+++ b/src/mainboard/supermicro/x7db8/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SUPERMICRO_X7DB8

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_LGA771
    select SOUTHBRIDGE_INTEL_I3100
    select NORTHBRIDGE_INTEL_I5000
diff --git a/src/mainboard/technexion/tim5690/Kconfig b/src/mainboard/technexion/tim5690/Kconfig
index c0aca27..072919d 100644
--- a/src/mainboard/technexion/tim5690/Kconfig
+++ b/src/mainboard/technexion/tim5690/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TECHNEXION_TIM5690

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_S1G1
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_RS690
diff --git a/src/mainboard/technexion/tim8690/Kconfig b/src/mainboard/technexion/tim8690/Kconfig
index 890b7ac..4e0b25a 100644
--- a/src/mainboard/technexion/tim8690/Kconfig
+++ b/src/mainboard/technexion/tim8690/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TECHNEXION_TIM8690

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_S1G1
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_RS690
diff --git a/src/mainboard/technologic/ts5300/Kconfig b/src/mainboard/technologic/ts5300/Kconfig
index 8def16d..0006fd7 100644
--- a/src/mainboard/technologic/ts5300/Kconfig
+++ b/src/mainboard/technologic/ts5300/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TECHNOLOGIC_TS5300

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SC520
    select ROMCC
    select HAVE_OPTION_TABLE
diff --git a/src/mainboard/televideo/tc7020/Kconfig b/src/mainboard/televideo/tc7020/Kconfig
index ab41e5b..6d77f59 100644
--- a/src/mainboard/televideo/tc7020/Kconfig
+++ b/src/mainboard/televideo/tc7020/Kconfig
@@ -20,7 +20,6 @@ if BOARD_TELEVIDEO_TC7020

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_GX1
    select NORTHBRIDGE_AMD_GX1
    select SOUTHBRIDGE_AMD_CS5530
diff --git a/src/mainboard/thomson/ip1000/Kconfig b/src/mainboard/thomson/ip1000/Kconfig
index b1988dd..971c41c 100644
--- a/src/mainboard/thomson/ip1000/Kconfig
+++ b/src/mainboard/thomson/ip1000/Kconfig
@@ -2,7 +2,6 @@ if BOARD_THOMSON_IP1000

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MFCBGA479
    select NORTHBRIDGE_INTEL_I82830
    select SOUTHBRIDGE_INTEL_I82801DX
diff --git a/src/mainboard/ti/beaglebone/Kconfig b/src/mainboard/ti/beaglebone/Kconfig
index c842a5d..7dd0edc 100644
--- a/src/mainboard/ti/beaglebone/Kconfig
+++ b/src/mainboard/ti/beaglebone/Kconfig
@@ -21,7 +21,6 @@ if BOARD_TI_BEAGLEBONE

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_ARMV7
    select CPU_TI_AM335X
    select BOARD_ROMSIZE_KB_4096

diff --git a/src/mainboard/traverse/geos/Kconfig b/src/mainboard/traverse/geos/Kconfig
index 3139d7d..945ab09 100644
--- a/src/mainboard/traverse/geos/Kconfig
+++ b/src/mainboard/traverse/geos/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TRAVERSE_GEOS

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/tyan/s1846/Kconfig b/src/mainboard/tyan/s1846/Kconfig
index b4e6c92..e491d3f 100644
--- a/src/mainboard/tyan/s1846/Kconfig
+++ b/src/mainboard/tyan/s1846/Kconfig
@@ -20,7 +20,6 @@ if BOARD_TYAN_S1846

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SLOT_1
    select NORTHBRIDGE_INTEL_I440BX
    select SOUTHBRIDGE_INTEL_I82371EB
diff --git a/src/mainboard/tyan/s2735/Kconfig b/src/mainboard/tyan/s2735/Kconfig
index f908908..a13db8b 100644
--- a/src/mainboard/tyan/s2735/Kconfig
+++ b/src/mainboard/tyan/s2735/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S2735

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_INTEL_SOCKET_MPGA604
    select NORTHBRIDGE_INTEL_E7501
    select SOUTHBRIDGE_INTEL_I82870
diff --git a/src/mainboard/tyan/s2850/Kconfig b/src/mainboard/tyan/s2850/Kconfig
index 88ab969..e6e3df2 100644
--- a/src/mainboard/tyan/s2850/Kconfig
+++ b/src/mainboard/tyan/s2850/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S2850

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/tyan/s2875/Kconfig b/src/mainboard/tyan/s2875/Kconfig
index 8e77709..30aa01e 100644
--- a/src/mainboard/tyan/s2875/Kconfig
+++ b/src/mainboard/tyan/s2875/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S2875

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8151
diff --git a/src/mainboard/tyan/s2880/Kconfig b/src/mainboard/tyan/s2880/Kconfig
index c6fed4b..5186337 100644
--- a/src/mainboard/tyan/s2880/Kconfig
+++ b/src/mainboard/tyan/s2880/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S2880

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8131
diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig
index fcc93f3..6c759e1 100644
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S2881

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8131
diff --git a/src/mainboard/tyan/s2882/Kconfig b/src/mainboard/tyan/s2882/Kconfig
index 0a0909a..646b5a8 100644
--- a/src/mainboard/tyan/s2882/Kconfig
+++ b/src/mainboard/tyan/s2882/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S2882

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8131
diff --git a/src/mainboard/tyan/s2885/Kconfig b/src/mainboard/tyan/s2885/Kconfig
index aab6732..86e43f8 100644
--- a/src/mainboard/tyan/s2885/Kconfig
+++ b/src/mainboard/tyan/s2885/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S2885

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig
index ddd7ed0..85206df 100644
--- a/src/mainboard/tyan/s2891/Kconfig
+++ b/src/mainboard/tyan/s2891/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S2891

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig
index ddf2901..a550942 100644
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S2892

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig
index 0201eb4..c8510aa 100644
--- a/src/mainboard/tyan/s2895/Kconfig
+++ b/src/mainboard/tyan/s2895/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S2895

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig
index 731cc5c..84be620 100644
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/src/mainboard/tyan/s2912/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S2912

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index a7f9954..e13d7c4 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S2912_FAM10

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_F_1207
    select DIMM_DDR2
    select DIMM_REGISTERED
diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig
index 449aa39..d4feacb 100644
--- a/src/mainboard/tyan/s4880/Kconfig
+++ b/src/mainboard/tyan/s4880/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S4880

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig
index ec1f7a9..2bd3854 100644
--- a/src/mainboard/tyan/s4882/Kconfig
+++ b/src/mainboard/tyan/s4882/Kconfig
@@ -2,7 +2,6 @@ if BOARD_TYAN_S4882

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_AMD_AMD8111
diff --git a/src/mainboard/tyan/s8226/Kconfig b/src/mainboard/tyan/s8226/Kconfig
index e8d2f88..1aa5da4 100644
--- a/src/mainboard/tyan/s8226/Kconfig
+++ b/src/mainboard/tyan/s8226/Kconfig
@@ -21,7 +21,6 @@ if BOARD_TYAN_S8226

config BOARD_SPECIFIC_OPTIONS
    def_bool y
-	select ARCH_X86
    select CPU_AMD_AGESA_FAMILY15
    select CPU_AMD_SOCKET_C32
    select NORTHBRIDGE_AMD_AGESA_FAMILY15
diff --git a/src/mainboard/via/epia-cn/Kconfig b/src/mainboard/via/epia-cn/Kconfig
index e7920e7..266e7e9 100644
--- a/src/mainboard/via/epia-cn/Kconfig
+++ b/src/mainboard/via/epia-cn/Kconfig
@@ -2,7 +2,6 @@ if BOARD_VIA_EPIA_CN

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_VIA_C7
    select NORTHBRIDGE_VIA_CN700
    select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/via/epia-m/Kconfig b/src/mainboard/via/epia-m/Kconfig
index 3e8a93d..f05c99c 100644
--- a/src/mainboard/via/epia-m/Kconfig
+++ b/src/mainboard/via/epia-m/Kconfig
@@ -2,7 +2,6 @@ if BOARD_VIA_EPIA_M || BOARD_VIA_EPIA_MII || BOARD_VIA_EPIA_ML

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_VIA_C3
    select NORTHBRIDGE_VIA_VT8623
    select SOUTHBRIDGE_VIA_VT8235
diff --git a/src/mainboard/via/epia-m700/Kconfig b/src/mainboard/via/epia-m700/Kconfig
index fcadabc..c64f8d2 100644
--- a/src/mainboard/via/epia-m700/Kconfig
+++ b/src/mainboard/via/epia-m700/Kconfig
@@ -2,7 +2,6 @@ if BOARD_VIA_EPIA_M700

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_VIA_C7
    select NORTHBRIDGE_VIA_VX800
    select SUPERIO_WINBOND_W83697HF
diff --git a/src/mainboard/via/epia-m850/Kconfig b/src/mainboard/via/epia-m850/Kconfig
index 01ef032..65fd478 100644
--- a/src/mainboard/via/epia-m850/Kconfig
+++ b/src/mainboard/via/epia-m850/Kconfig
@@ -21,7 +21,6 @@ if BOARD_VIA_EPIA_M850

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_VIA_NANO
    select NORTHBRIDGE_VIA_VX900
    select SUPERIO_FINTEK_F81865F
diff --git a/src/mainboard/via/epia-mii/Kconfig b/src/mainboard/via/epia-mii/Kconfig
index 6106ad2..ff31b93 100644
--- a/src/mainboard/via/epia-mii/Kconfig
+++ b/src/mainboard/via/epia-mii/Kconfig
@@ -1,7 +1,6 @@
 if BOARD_VIA_EPIA_MII

# Dummy for abuild
-#select ARCH_X86

config MAINBOARD_PART_NUMBER
    string
diff --git a/src/mainboard/via/epia-ml/Kconfig b/src/mainboard/via/epia-ml/Kconfig
index 54eac0d..5e7b6ab 100644
--- a/src/mainboard/via/epia-ml/Kconfig
+++ b/src/mainboard/via/epia-ml/Kconfig
@@ -1,7 +1,6 @@
 if BOARD_VIA_EPIA_ML

# Dummy for abuild
-#select ARCH_X86

config MAINBOARD_PART_NUMBER
    string
diff --git a/src/mainboard/via/epia-n/Kconfig b/src/mainboard/via/epia-n/Kconfig
index 2b327b7..3ea6878 100644
--- a/src/mainboard/via/epia-n/Kconfig
+++ b/src/mainboard/via/epia-n/Kconfig
@@ -2,7 +2,6 @@ if BOARD_VIA_EPIA_N

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_VIA_C3
    select NORTHBRIDGE_VIA_CN400
    select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/via/epia/Kconfig b/src/mainboard/via/epia/Kconfig
index 60ce4f5..7ee1ed8 100644
--- a/src/mainboard/via/epia/Kconfig
+++ b/src/mainboard/via/epia/Kconfig
@@ -2,7 +2,6 @@ if BOARD_VIA_EPIA

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_VIA_C3
    select NORTHBRIDGE_VIA_VT8601
    select SOUTHBRIDGE_VIA_VT8231
diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig
index 70aa8d7..97f2088 100644
--- a/src/mainboard/via/pc2500e/Kconfig
+++ b/src/mainboard/via/pc2500e/Kconfig
@@ -2,7 +2,6 @@ if BOARD_VIA_PC2500E

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_VIA_C7
    select NORTHBRIDGE_VIA_CN700
    select SOUTHBRIDGE_VIA_VT8237R
diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig
index 14eebe6..da71c87 100644
--- a/src/mainboard/via/vt8454c/Kconfig
+++ b/src/mainboard/via/vt8454c/Kconfig
@@ -2,7 +2,6 @@ if BOARD_VIA_VT8454C

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_VIA_C7
    select NORTHBRIDGE_VIA_CX700
    select SUPERIO_VIA_VT1211
diff --git a/src/mainboard/winent/mb6047/Kconfig b/src/mainboard/winent/mb6047/Kconfig
index 507340c..ee34d1a 100644
--- a/src/mainboard/winent/mb6047/Kconfig
+++ b/src/mainboard/winent/mb6047/Kconfig
@@ -2,7 +2,6 @@ if BOARD_WINENT_MB6047

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_SOCKET_940
    select NORTHBRIDGE_AMD_AMDK8
    select SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/mainboard/winent/pl6064/Kconfig b/src/mainboard/winent/pl6064/Kconfig
index 7db7de5..3a36f29 100644
--- a/src/mainboard/winent/pl6064/Kconfig
+++ b/src/mainboard/winent/pl6064/Kconfig
@@ -2,7 +2,6 @@ if BOARD_WINENT_PL6064

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_LX
    select NORTHBRIDGE_AMD_LX
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/mainboard/wyse/s50/Kconfig b/src/mainboard/wyse/s50/Kconfig
index d8d2628..fbb5246 100644
--- a/src/mainboard/wyse/s50/Kconfig
+++ b/src/mainboard/wyse/s50/Kconfig
@@ -20,7 +20,6 @@ if BOARD_WYSE_S50

config BOARD_SPECIFIC_OPTIONS # dummy
    def_bool y
-	select ARCH_X86
    select CPU_AMD_GEODE_GX2
    select NORTHBRIDGE_AMD_GX2
    select SOUTHBRIDGE_AMD_CS5536
diff --git a/src/soc/Kconfig b/src/soc/Kconfig
index ac29205..823d76c 100644
--- a/src/soc/Kconfig
+++ b/src/soc/Kconfig
@@ -1,3 +1 @@
-if ARCH_X86
 source src/soc/intel/Kconfig
-endif
diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig
index 2360b36..1b3ee05 100644
--- a/src/soc/intel/baytrail/Kconfig
+++ b/src/soc/intel/baytrail/Kconfig
@@ -8,6 +8,7 @@ if SOC_INTEL_BAYTRAIL

config CPU_SPECIFIC_OPTIONS
    def_bool y
+	select ARCH_X86
    select CACHE_MRC_SETTINGS
    select CAR_MIGRATION
    select COLLECT_TIMESTAMPS
diff --git a/util/abuild/abuild b/util/abuild/abuild
index a5a57c9..d3c57cc 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -284,80 +284,12 @@ function build_target
    	return
    fi

-	# default setting
-
-	CC="${CROSS_COMPILE}gcc"
-	CROSS_COMPILE=""
-	found_crosscompiler=false
-	if which $TARCH-elf-gcc 2>/dev/null >/dev/null; then
-		# i386-elf target needs --divide, for i386-linux, that's the default
-		if [ "$TARCH" = "i386" ]; then
-			CC="$CC -Wa,--divide"
-		fi
-		CROSS_COMPILE="$TARCH-elf-"
-		CC=gcc
-		CROSS_TEXT=", using $CROSS_COMPILE$CC"
-		found_crosscompiler=true
-	fi
-
    HOSTCC='gcc'

printf "Building $VENDOR/$MAINBOARD; "
    mkdir -p $TOP/$TARGET/${VENDOR}_${MAINBOARD} $TOP/$TARGET/abuild
    XMLFILE=$TOP/$TARGET/abuild/${VENDOR}_${MAINBOARD}.xml

-	if [ "$ARCH" = "$TARCH" -o $found_crosscompiler = true ]; then
-		printf "$TARCH: ok$CROSS_TEXT\n"
-	else
-		# FIXME this is basically the same as above.
-		found_crosscompiler=false
-		if [ "$ARCH" == amd64 -a "$TARCH" == i386 ]; then
-			CC="gcc -m32"
-			found_crosscompiler=true
-		fi
-		if [ "$ARCH" == ppc64 -a "$TARCH" == ppc ]; then
-			CC="gcc -m32"
-			found_crosscompiler=true
-		fi
-		if [ "$found_crosscompiler" == "false" -a "$TARCH" == ppc ];then
-			for prefix in powerpc-eabi- powerpc-linux- ppc_74xx- \
-			    powerpc-7450-linux-gnu- powerpc-elf-; do
-				if ${prefix}gcc --version > /dev/null 2> /dev/null ; then
-					found_crosscompiler=true
-					CROSS_COMPILE=$prefix
-				fi
-			done
-		fi
-		if [ "$found_crosscompiler" == "false" -a "$TARCH" == ARMV7 ];then
-			for prefix in armv7a-eabi- armv7-a-eabi- armv7a-cros-linux-gnueabi-; do
-				if ${prefix}gcc --version > /dev/null 2> /dev/null ; then
-					found_crosscompiler=true
-					CROSS_COMPILE=$prefix
-				fi
-			done
-		fi
-
-		# TBD: look for suitable cross compiler suite
-		# cross-$TARCH-gcc and cross-$TARCH-ld
-
-		# Check result:
-		if [ $found_crosscompiler == "false" ]; then
-			printf "$TARCH: skipped, we're $ARCH\n\n"
-			junit "<testcase classname='board' name='$TARCH/$VENDOR/$MAINBOARD' >"
-			junit " <failure type='NoCrossCompiler'>No cross-compiler for $TARCH found</failure>"
-			junit "</testcase>"
-
-			return 0
-		else
-			printf "$TARCH: ok, $ARCH using ${CROSS_COMPILE}gcc\n"
-		fi
-	fi
-
-	CC=${CROSS_COMPILE}$CC
-
-	if  [ "$stackprotect" = "true" ]; then
-		CC="$CC -fno-stack-protector"
-	fi

stime=`perl -e 'print time();' 2>/dev/null || date +%s`
    create_buildenv $VENDOR $MAINBOARD $CONFIG