17 files changed, 10 insertions, 25 deletions

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index e27aec246333..5713a21d653a 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -13,7 +13,6 @@
 
 config ARCH_X86
 	bool
-	default n
 	select PCI
 	select RELOCATABLE_MODULES
 
@@ -21,17 +20,16 @@ config ARCH_X86
 
 config ARCH_BOOTBLOCK_X86_32
 	bool
-	default n
 	select ARCH_X86
 	select BOOTBLOCK_CUSTOM if ROMCC_BOOTBLOCK
 
 config ARCH_VERSTAGE_X86_32
 	bool
-	default n
+	select ARCH_X86
 
 config ARCH_ROMSTAGE_X86_32
 	bool
-	default n
+	select ARCH_X86
 
 config ARCH_POSTCAR_X86_32
 	bool
@@ -39,23 +37,22 @@ config ARCH_POSTCAR_X86_32
 
 config ARCH_RAMSTAGE_X86_32
 	bool
-	default n
+	select ARCH_X86
 
 # stage selectors for x64
 
 config ARCH_BOOTBLOCK_X86_64
 	bool
-	default n
 	select ARCH_X86
 	select BOOTBLOCK_CUSTOM if ROMCC_BOOTBLOCK
 
 config ARCH_VERSTAGE_X86_64
 	bool
-	default n
+	select ARCH_X86
 
 config ARCH_ROMSTAGE_X86_64
 	bool
-	default n
+	select ARCH_X86
 
 config ARCH_POSTCAR_X86_64
 	bool
@@ -63,7 +60,9 @@ config ARCH_POSTCAR_X86_64
 
 config ARCH_RAMSTAGE_X86_64
 	bool
-	default n
+	select ARCH_X86
+
+if ARCH_X86
 
 config ARCH_X86_64_PGTBL_LOC
 	hex "x86_64 page table location in CBFS"
@@ -350,3 +349,5 @@ config MAX_PIRQ_LINKS
 	  also have a separate link for ATA or IOAPIC interrupts. When the PIRQ
 	  table specifies links greater than 4, pirq_route_irqs will not
 	  function properly, unless this variable is correctly set.
+
+endif
diff --git a/src/mainboard/apple/macbook21/Kconfig b/src/mainboard/apple/macbook21/Kconfig
index 93e2d8d9b43e..9eb06ff36e4c 100644
--- a/src/mainboard/apple/macbook21/Kconfig
+++ b/src/mainboard/apple/macbook21/Kconfig
@@ -3,7 +3,6 @@ if BOARD_APPLE_MACBOOK11 || BOARD_APPLE_MACBOOK21 || BOARD_APPLE_IMAC52
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select SYSTEM_TYPE_LAPTOP
-	select ARCH_X86
 	select CPU_INTEL_SOCKET_M
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GM
diff --git a/src/mainboard/asrock/g41c-gs/Kconfig b/src/mainboard/asrock/g41c-gs/Kconfig
index 81b099598881..5f669691009c 100644
--- a/src/mainboard/asrock/g41c-gs/Kconfig
+++ b/src/mainboard/asrock/g41c-gs/Kconfig
@@ -20,7 +20,6 @@ if BOARD_ASROCK_G41C_GS || BOARD_ASROCK_G41C_GS_R2_0 || \
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select CPU_INTEL_SOCKET_LGA775
 	select NORTHBRIDGE_INTEL_X4X
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/asus/p5gc-mx/Kconfig b/src/mainboard/asus/p5gc-mx/Kconfig
index a0e60146a069..7b5cd19ac4b0 100644
--- a/src/mainboard/asus/p5gc-mx/Kconfig
+++ b/src/mainboard/asus/p5gc-mx/Kconfig
@@ -17,7 +17,6 @@ if BOARD_ASUS_P5GC_MX
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select CPU_INTEL_SOCKET_LGA775
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GC
diff --git a/src/mainboard/asus/p5qc/Kconfig b/src/mainboard/asus/p5qc/Kconfig
index 9c147875f15c..b59cd3cd444e 100644
--- a/src/mainboard/asus/p5qc/Kconfig
+++ b/src/mainboard/asus/p5qc/Kconfig
@@ -18,7 +18,6 @@ if BOARD_ASUS_P5QC || BOARD_ASUS_P5Q_PRO || BOARD_ASUS_P5QL_PRO
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select CPU_INTEL_SOCKET_LGA775
 	select NORTHBRIDGE_INTEL_X4X
 	select SOUTHBRIDGE_INTEL_I82801JX
diff --git a/src/mainboard/asus/p5qpl-am/Kconfig b/src/mainboard/asus/p5qpl-am/Kconfig
index 7cdfea9048df..0932241655c6 100644
--- a/src/mainboard/asus/p5qpl-am/Kconfig
+++ b/src/mainboard/asus/p5qpl-am/Kconfig
@@ -18,7 +18,6 @@ if BOARD_ASUS_P5QPL_AM || BOARD_ASUS_P5G41T_M_LX
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select CPU_INTEL_SOCKET_LGA775
 	select NORTHBRIDGE_INTEL_X4X
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/asus/p8h61-m_pro/Kconfig b/src/mainboard/asus/p8h61-m_pro/Kconfig
index 0c8988e0c8bd..e9b8ab0f07a1 100644
--- a/src/mainboard/asus/p8h61-m_pro/Kconfig
+++ b/src/mainboard/asus/p8h61-m_pro/Kconfig
@@ -17,7 +17,6 @@ if BOARD_ASUS_P8H61_M_PRO
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select BOARD_ROMSIZE_KB_4096
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
diff --git a/src/mainboard/foxconn/g41s-k/Kconfig b/src/mainboard/foxconn/g41s-k/Kconfig
index 3597e4c82f7b..c35575835de2 100644
--- a/src/mainboard/foxconn/g41s-k/Kconfig
+++ b/src/mainboard/foxconn/g41s-k/Kconfig
@@ -18,7 +18,6 @@ if BOARD_FOXCONN_G41S_K || BOARD_FOXCONN_G41M
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select CPU_INTEL_SOCKET_LGA775
 	select NORTHBRIDGE_INTEL_X4X
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
index 3c373a767b3a..ea1a2fc689bd 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
@@ -17,7 +17,6 @@ if BOARD_GIGABYTE_GA_945GCM_S2L || BOARD_GIGABYTE_GA_945GCM_S2C
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select CPU_INTEL_SOCKET_LGA775
 	select NORTHBRIDGE_INTEL_I945
 	select NORTHBRIDGE_INTEL_SUBTYPE_I945GC
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
index 1ad68f4a9654..719a64967898 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
@@ -2,7 +2,6 @@ if BOARD_GIGABYTE_GA_B75M_D3H || BOARD_GIGABYTE_GA_B75M_D3V || BOARD_GIGABYTE_GA
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_C216
diff --git a/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig b/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
index 6280facbc06d..e928cbecaf1f 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
@@ -17,7 +17,6 @@ if BOARD_GIGABYTE_GA_G41M_ES2L
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select CPU_INTEL_SOCKET_LGA775
 	select NORTHBRIDGE_INTEL_X4X
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig b/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig
index 62d7f40117de..62c422aa5330 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig
@@ -17,7 +17,6 @@ if BOARD_GIGABYTE_GA_H61M_S2PV || BOARD_GIGABYTE_GA_H61MA_D3V
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select BOARD_ROMSIZE_KB_4096
 	select HAVE_ACPI_RESUME
 	select HAVE_ACPI_TABLES
diff --git a/src/mainboard/intel/dg41wv/Kconfig b/src/mainboard/intel/dg41wv/Kconfig
index 74c7d5270c39..648634ee5143 100644
--- a/src/mainboard/intel/dg41wv/Kconfig
+++ b/src/mainboard/intel/dg41wv/Kconfig
@@ -18,7 +18,6 @@ if BOARD_INTEL_DG41WV
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select CPU_INTEL_SOCKET_LGA775
 	select NORTHBRIDGE_INTEL_X4X
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/intel/dg43gt/Kconfig b/src/mainboard/intel/dg43gt/Kconfig
index 341baaa302ca..3c457ba1e269 100644
--- a/src/mainboard/intel/dg43gt/Kconfig
+++ b/src/mainboard/intel/dg43gt/Kconfig
@@ -18,7 +18,6 @@ if BOARD_INTEL_DG43GT
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select CPU_INTEL_SOCKET_LGA775
 	select NORTHBRIDGE_INTEL_X4X
 	select SOUTHBRIDGE_INTEL_I82801JX
diff --git a/src/mainboard/lenovo/thinkcentre_a58/Kconfig b/src/mainboard/lenovo/thinkcentre_a58/Kconfig
index 6d8b3dcd39ff..b42866cee7a9 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/Kconfig
+++ b/src/mainboard/lenovo/thinkcentre_a58/Kconfig
@@ -18,7 +18,6 @@ if BOARD_LENOVO_THINKCENTRE_A58
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select CPU_INTEL_SOCKET_LGA775
 	select NORTHBRIDGE_INTEL_X4X
 	select SOUTHBRIDGE_INTEL_I82801GX
diff --git a/src/mainboard/msi/ms7707/Kconfig b/src/mainboard/msi/ms7707/Kconfig
index c1a1b4c74827..96ca719ea393 100644
--- a/src/mainboard/msi/ms7707/Kconfig
+++ b/src/mainboard/msi/ms7707/Kconfig
@@ -2,7 +2,6 @@ if BOARD_MSI_MS7707
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_BD82X6X
diff --git a/src/mainboard/sapphire/pureplatinumh61/Kconfig b/src/mainboard/sapphire/pureplatinumh61/Kconfig
index 0e289c18d4bc..707d2c9d8df3 100644
--- a/src/mainboard/sapphire/pureplatinumh61/Kconfig
+++ b/src/mainboard/sapphire/pureplatinumh61/Kconfig
@@ -2,7 +2,6 @@ if BOARD_SAPPHIRE_PUREPLATINUMH61
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_X86
 	select NORTHBRIDGE_INTEL_SANDYBRIDGE
 	select USE_NATIVE_RAMINIT
 	select SOUTHBRIDGE_INTEL_BD82X6X