diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig
index bf5ce8e793..6fced37880 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 a04d8a4191..88d71d7eed 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 15ed8610fc..c73e00d688 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 fa1d052a09..b87e8bcd97 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 fe5a291066..b96c7703fc 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 ac59c3fc37..6aceab2ba8 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 bc20219a54..30c2486e67 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 2ea381e9cb..1a811f42d4 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 6d9494e32f..46377be387 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 9a81db6530..0c8fadafc2 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
default n
if CPU_ARMLTD_CORTEX_A9
diff --git a/src/cpu/dmp/vortex86ex/Kconfig b/src/cpu/dmp/vortex86ex/Kconfig
index 54db4e004e..aea8889ec6 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 380869a610..fa96f8dec5 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 6a008bf3b2..22d01e6f61 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 b13d6861bd..97309ae622 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 7d5bf94918..4d6add6ef9 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 c438008eec..ea6f5ca7d1 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 bbb4eb1b64..4c7456d352 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 90af45d274..64b2a0a59a 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 e8f0767ce4..b3fa7bd350 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 74ef8d5125..7558bc2765 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 9d9983ed0c..670163a53b 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 4e88979c5f..e4a0e6c3dc 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 26b5995f68..4dc6fe6f68 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 546d9ece2e..e6d5f1e784 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 8187838163..eee864d957 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 3335a26211..b8de3031e3 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 b572385b4f..49cfe2d729 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 06165890e1..2ed68d14db 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 fd649201f5..3bdb7f6e96 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 8483d332f4..62393a89b1 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 8ae2dcff29..5c9d0a3b93 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 c21a2743bf..849dcd0902 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 6c5c3fd4d4..e54e4dbe97 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 86e74a9f8b..f9aaf79adf 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 DYNAMIC_CBMEM
diff --git a/src/cpu/samsung/exynos5420/Kconfig b/src/cpu/samsung/exynos5420/Kconfig
index 8366ea3486..59bc875280 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 DYNAMIC_CBMEM
diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig
index 3eb4950f1c..e88f6fc3e3 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 259a1f211d..566f07c705 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 ebbb8f9f02..d5f1a4195a 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 674c0f3f0c..0f4f994e7f 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 81c23a8db0..036d8e6d36 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 da94c7f460..d19f92dfb5 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 9986987a37..6b156b2f30 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 feb00de620..5dc1ca04eb 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 32500d6573..52ec82792c 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 25ff69cd65..86bcd7ac17 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 a04c1311de..f9557b2c40 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 ee2aa0f44c..c6f99e9e93 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 ba68a54d10..70d63ad5eb 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 6768a57dac..04644790a5 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 6713ce7e17..2948b52457 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 7e3486ff10..394ad77173 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 2bc6a1d2f0..b719592984 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 dec8e01d34..eb83c1ef8e 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 8be5a18042..452f16d7b8 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 16fadfa452..df26b2b635 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 e09a17086e..1e03edb946 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 2eb6612e12..9a91eece24 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 1d60d0c35c..69aee990d8 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 5a6f02286d..53dd595ca8 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 37cbfa423c..04a1ce00c7 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 346a5567a1..9709c6142e 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 66374f299f..1f12883394 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 111ac29954..7ebf487034 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 2e16bb438d..85d9d93ad3 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 69f65486e5..2d0cadbf63 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 c620c9a1b7..1802b5aec7 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 2b6f75875e..49860b303b 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 99a621828a..c512f7b28d 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 08ab2e0424..f69f6efafb 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 e8c8dde50c..a40c86c328 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 9d3dd5cabc..cfaa599784 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 561f4bcc7b..664c6c7ece 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 ccd060e85d..d27e1d4bb3 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 43a2d2c563..86601ed3f0 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 fdeaf87e55..e2ac03dea5 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 e953ed4f1a..a1533c4915 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 c5b9374835..dcc75fa341 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 99aa56d965..c130a9f96a 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 385915676a..2280451077 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 51426ac3d4..0e829f084b 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 959ad6c257..5f7a39e318 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 f76ff7b561..2c1331f6d3 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 263bad98dd..099309689e 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 197b3a0236..744b881173 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 f6ba242c5e..9e49ba047e 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 af4fb7c6a4..1a709bc22c 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 7ff25d4cf9..ae59599c7c 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 ffd6e220c3..ad08c31056 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 341c533063..58910bec8b 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 54a1bae17e..b84a14219b 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 652b31aefe..6a70e716b4 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 e0554ca543..07fa74474a 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 f138463808..3822eb7884 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 a57f7fbfa2..b1b5597874 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 d47dfdbc17..07cd91ff6e 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 abfaaec4ea..3b96d197cb 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 868c8d1904..97c33aaebb 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 50ac62b582..8897102d49 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 23b206e97f..baef807cdd 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 d0a7807ada..503c92b63c 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 78e014e65c..f6a80af816 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 8d86ab4b4e..d83ceace1a 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 502576ce97..a02fa126f0 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 1242a94266..62f038cae8 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 5c4c1a16cb..c12732959c 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 a20a5c8a5f..8c57a89e89 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 d54037a058..4cd6f11430 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 0b54906757..bc8e3ac71b 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 e70d51dddd..d76799e1ac 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 cc507f0448..3c0a800510 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 c88d9765b0..99170be90c 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 bbeae08134..01f3baad99 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 b9df41eba9..0a750df425 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 ad7576bfe5..674d890286 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 db42233049..3696b14ac4 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 62625fbd62..8ea1abd2b3 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 6e3462e261..5b35e7d379 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 9b0ef05a50..3fbb8cdff7 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 1ffa552ddf..491df9cd5e 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 7582320943..94b449f351 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 0ea4eb723f..f98c0ddde4 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 d663eca036..4a87aab544 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 a4252e3943..ff95b297af 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 47d41edbcc..09106618cd 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 51ce13bb0b..1b7fe32adb 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 5d19ffc1a8..b369d62db9 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 efe9519bb2..fcecca0fe4 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 d8a4e7a3fc..23cea06dda 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 f401feb7ab..204e28dab2 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 cec4e31781..5196c2ce12 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 00af512571..c0cb8cae49 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 ba6a6fe9d5..3c34938d26 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 448484dd00..e636df95ba 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 d5e265f338..e68345513c 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 a169b88235..0c6d6428f1 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 be3f009db6..9885e2b8d4 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 b72b8dd942..ba8c799bd6 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 e78238c61d..c5aa340ce1 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 d6cdb10615..202f831a55 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 72b916f51b..8975be21ff 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 0a8442baf1..d002dce364 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 2016ef979f..5632c30d82 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 03dffffdd9..e17d69ac13 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 62c867156b..05abdf6558 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 36db67bf49..8d0a9a4751 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 69e106e750..74a3c102de 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 e443c6c8d6..61c27722c1 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 1485c94894..8e92e69c69 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 0d6ac386ba..864da867d7 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 710094e63a..b52df97b7a 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 61f1c6d34b..774bbb856c 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 91edf33cdf..85b0e6cb99 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 b676eb69b1..490aa80f86 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 e74705b03c..bc0799c79c 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 01082d4142..77aa910e6d 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 2a62777449..6ecbc870f1 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 af40cad18c..4097fa7a23 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 5f7de086e7..5aa4b57cfd 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 00ea604bb8..6fd3813332 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 276b1f7b5b..923d39a645 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 c6c15d593b..e29615e05a 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 6ccee762ef..11b11b9aed 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 d7fefd84d9..c270f6f7e3 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 bdbeb6973a..84579444c5 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 811b37ec77..d2b413b0c2 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 b46e29ed99..8c8bbaf361 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 edd75f86c8..d59e703d6c 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 85d7558c56..0f85386b54 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 01c4a59a9a..106b610a9e 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 29d4da46a5..f5d4f8c55b 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 b0b0195210..2891736b59 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 e9d1ce790a..96153f7cc5 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 1a306cf804..e042e81b4e 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 701b2edc7f..99b58493b4 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 6a743d5115..cb2bb39eec 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 860a953b83..ff9f0ae6cc 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 cd1f761691..2ce51a851c 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 7ed2665f04..115804632c 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 feb5f78848..c8f9a24116 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 f598882517..7dd71e9a42 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 422cded5e9..95dd96dfe8 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 234f2161c2..04c22201c6 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 c4684c94e2..c3aab0e918 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 f5ec9b9d77..051713a27d 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 c4a2ce8937..65645fdbf0 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 7660acb235..63200b3040 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 e55298228e..6228a6ec68 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 7705522787..00ed0d9dfa 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 9b51a492f4..fa4af805cf 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 58654f68cb..840751cba7 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 4baee5eb4a..cc70e76160 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 76b6625e42..f2cfd9a7b2 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 27bd3e58ee..c8ff25e7c8 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 7823d563d9..0b0ff1cb0e 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 1359a893e5..76903e2626 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 42ceff4d91..e305551123 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 82c2f9d613..6fddcc108a 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 94de54ba04..e3d5698bfe 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 58d6d37290..bb726885e1 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 e04caaace6..4fe3b4d340 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 fab87108ec..bbd78a3e1b 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 e2ff77cd49..8bed484797 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 7ea32c31b1..a350e11fad 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 4329f1932a..41b9cf4721 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 ecbd2ccafc..975977f250 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 365980e143..94290d536a 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 2c1944a75f..67fc88acff 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 500427a331..9c8c466d61 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 e1e0cfa452..e38efe0cc9 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 8d0ff80455..dff329f751 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 096aa7cd6c..a268bad992 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 80e08c4966..f95fc8cde8 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 bfcb724c31..62ae51a17e 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 546dfa598f..32f0391fc9 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 2f48b329e4..e1ce4e72c1 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 2ff782a765..2ca73bea0e 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 27172ffad1..8d91f6fc6f 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 7260f998cf..4a58d04b5f 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 87cfc73d55..de48dba629 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 90a800cee0..4999320d68 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 ab8d00b8f6..d5204151ef 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 b4630fe108..159c9c3cb4 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 0b25fcdb94..e02b2dda50 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 70df01ae34..9c8e4a6900 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 7becacba8a..f5b0e112b4 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 c0aca2760a..072919ddf0 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 890b7ac876..4e0b25a146 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 8def16dc8e..0006fd7903 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 ab41e5b921..6d77f5901f 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 b1988ddae6..971c41c475 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 a24fcde075..fd465fa8b1 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 3139d7dc1b..945ab0975b 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 b4e6c9216c..e491d3fc4e 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 f908908b09..a13db8bb48 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 88ab969440..e6e3df2e42 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 8e777099aa..30aa01ee8f 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 c6fed4bdfe..518633728e 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 fcc93f3d32..6c759e1f0c 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 0a0909a625..646b5a87eb 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 aab6732bc5..86e43f8b9a 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 ddd7ed0c80..85206df3b9 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 ddf2901201..a55094214f 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 0201eb4a6b..c8510aa921 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 731cc5c7f5..84be620aed 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 a7f995428d..e13d7c4272 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 449aa3915a..d4feacbb43 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 ec1f7a9fd1..2bd3854087 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 e8d2f88b8b..1aa5da4612 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 e7920e77aa..266e7e9d1f 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 3e8a93de1a..f05c99c4e4 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 fcadabcb3b..c64f8d282f 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 01ef032c4e..65fd4782ca 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 6106ad2199..ff31b936c3 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 54eac0de7e..5e7b6abb36 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 2b327b708d..3ea6878df9 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 60ce4f593e..7ee1ed8dcd 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 70aa8d75fb..97f20880b8 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 14eebe6c8d..da71c8796b 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 507340c7ea..ee34d1a4a2 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 7db7de5791..3a36f29393 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 d8d2628f48..fbb5246d34 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 ac29205c9b..823d76c725 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 2360b36a73..1b3ee054f4 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 a5a57c9683..fc49797a65 100755
--- a/util/abuild/abuild
+++ b/util/abuild/abuild
@@ -72,9 +72,6 @@ silent=
# clang mode enabled by -sb option.
scanbuild=false
-# stackprotect mode enabled by -ns option.
-stackprotect=false
-
ARCH=`uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
-e s/i86pc/i386/ \
-e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ \
@@ -284,80 +281,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 ""
- junit " No cross-compiler for $TARCH found"
- junit ""
-
- 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
@@ -457,7 +386,6 @@ function myhelp
printf " [-T|--test] submit image(s) to automated test system\n"
printf " [-c|--cpus ] build on at the same time\n"
printf " [-s|--silent] omit compiler calls in logs\n"
- printf " [-ns|--nostackprotect] use gcc -fno-stack-protector option\n"
printf " [-sb|--scan-build] use clang's static analyzer\n"
printf " [-y|--ccache] use ccache\n"
printf " [-C|--config] configure-only mode\n"
@@ -505,7 +433,7 @@ cmdline="$* -c 1"
getoptbrand="`getopt -V`"
if [ "${getoptbrand:0:6}" == "getopt" ]; then
# Detected GNU getopt that supports long options.
- args=`getopt -l version,verbose,help,all,target:,payloads:,test,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,nostackprotect,scan-build,ccache,blobs -o Vvhat:p:Tc:sJCl:rP:uyB -- "$@"` || exit 1
+ args=`getopt -l version,verbose,help,all,target:,payloads:,test,cpus:,silent,junit,config,loglevel:,remove,prefix:,update,scan-build,ccache,blobs -o Vvhat:p:Tc:sJCl:rP:uyB -- "$@"` || exit 1
eval set -- $args
else
# Detected non-GNU getopt
@@ -539,7 +467,6 @@ while true ; do
expr "$1" : '-\?[0-9]\+$' > /dev/null && test 0$1 -gt 1 && cpuconfig="on $1 cpus in parallel"
shift;;
-s|--silent) shift; silent="-s";;
- -ns|--nostackprotect) shift; stackprotect=true;;
-sb|--scan-build) shift
scanbuild=true
customizing="${customizing}, scan-build"