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

CONFIG_ARCH is a property of the cpu or soc rather than a property of the board. Hence, move ARCH_* from every single board to respective cpu or soc Kconfigs. Also update abuild to ignore ARCH_ from mainboards. Change-Id: I6ec1206de5a20601c32d001a384a47f46e6ce479 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: http://review.coreboot.org/5570 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
2014-04-22 15:16:54 -07:00 · 2014-04-22 15:16:54 -07:00 · fd33781fbf
parent 2d9725e763
commit fd33781fbf
264 changed files with 42 additions and 307 deletions
--- 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
--- 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
--- 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
--- 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

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

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

--- 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
--- 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
--- a/src/cpu/amd/sc520/Kconfig
+++ b/src/cpu/amd/sc520/Kconfig
@ -1,2 +1,3 @@
 config CPU_AMD_SC520
 	bool
+	select ARCH_X86
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@ -19,3 +19,4 @@

 config CPU_QEMU_X86
 	bool
+	select ARCH_X86
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/Show More
+++ b/Show More