arch/x86: Make X86 stages select ARCH_X86
Also, don't define the default as this results in spurious lines in the
.config.
TEST: Build all boards with where config.h differed with
BUILD_TIMELESS=1 and remained the same
Change-Id: Ic77b696f493d7648f317f0ba0a27fdee5212961e
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31316
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index e27aec2..5713a21 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_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_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_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 @@
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 93e2d8d..9eb06ff 100644
--- a/src/mainboard/apple/macbook21/Kconfig
+++ b/src/mainboard/apple/macbook21/Kconfig
@@ -3,7 +3,6 @@
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 81b0995..5f66969 100644
--- a/src/mainboard/asrock/g41c-gs/Kconfig
+++ b/src/mainboard/asrock/g41c-gs/Kconfig
@@ -20,7 +20,6 @@
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 a0e6014..7b5cd19 100644
--- a/src/mainboard/asus/p5gc-mx/Kconfig
+++ b/src/mainboard/asus/p5gc-mx/Kconfig
@@ -17,7 +17,6 @@
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 9c14787..b59cd3c 100644
--- a/src/mainboard/asus/p5qc/Kconfig
+++ b/src/mainboard/asus/p5qc/Kconfig
@@ -18,7 +18,6 @@
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 7cdfea9..0932241 100644
--- a/src/mainboard/asus/p5qpl-am/Kconfig
+++ b/src/mainboard/asus/p5qpl-am/Kconfig
@@ -18,7 +18,6 @@
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 0c8988e0..e9b8ab0 100644
--- a/src/mainboard/asus/p8h61-m_pro/Kconfig
+++ b/src/mainboard/asus/p8h61-m_pro/Kconfig
@@ -17,7 +17,6 @@
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 3597e4c..c355758 100644
--- a/src/mainboard/foxconn/g41s-k/Kconfig
+++ b/src/mainboard/foxconn/g41s-k/Kconfig
@@ -18,7 +18,6 @@
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 3c373a7..ea1a2fc 100644
--- a/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-945gcm-s2l/Kconfig
@@ -17,7 +17,6 @@
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 1ad68f4..719a649 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
@@ -2,7 +2,6 @@
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 6280fac..e928cbe 100644
--- a/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
+++ b/src/mainboard/gigabyte/ga-g41m-es2l/Kconfig
@@ -17,7 +17,6 @@
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 62d7f40..62c422a 100644
--- a/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig
+++ b/src/mainboard/gigabyte/ga-h61m-s2pv/Kconfig
@@ -17,7 +17,6 @@
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 74c7d52..648634e 100644
--- a/src/mainboard/intel/dg41wv/Kconfig
+++ b/src/mainboard/intel/dg41wv/Kconfig
@@ -18,7 +18,6 @@
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 341baaa..3c457ba 100644
--- a/src/mainboard/intel/dg43gt/Kconfig
+++ b/src/mainboard/intel/dg43gt/Kconfig
@@ -18,7 +18,6 @@
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 6d8b3dc..b42866c 100644
--- a/src/mainboard/lenovo/thinkcentre_a58/Kconfig
+++ b/src/mainboard/lenovo/thinkcentre_a58/Kconfig
@@ -18,7 +18,6 @@
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 c1a1b4c..96ca719 100644
--- a/src/mainboard/msi/ms7707/Kconfig
+++ b/src/mainboard/msi/ms7707/Kconfig
@@ -2,7 +2,6 @@
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 0e289c1..707d2c9 100644
--- a/src/mainboard/sapphire/pureplatinumh61/Kconfig
+++ b/src/mainboard/sapphire/pureplatinumh61/Kconfig
@@ -2,7 +2,6 @@
config BOARD_SPECIFIC_OPTIONS
def_bool y
- select ARCH_X86
select NORTHBRIDGE_INTEL_SANDYBRIDGE
select USE_NATIVE_RAMINIT
select SOUTHBRIDGE_INTEL_BD82X6X