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