diff options
author | Angel Pons <th3fanbus@gmail.com> | 2021-06-22 12:58:20 +0200 |
---|---|---|
committer | Werner Zeh <werner.zeh@siemens.com> | 2021-06-30 04:48:59 +0000 |
commit | 8e035e3c1304f8b16533112758e3efe9f616f4d5 (patch) | |
tree | 3b3ad879f963faf948880de2a06ac057c2a134d3 /src/arch | |
parent | c839b3704987a187afc2db5bc0b44b9523486308 (diff) |
src: Move `select ARCH_X86` to platforms
To generalise the choice of 32-bit or 64-bit coreboot on x86 hardware,
have platforms select `ARCH_X86` directly instead of through per-stage
Kconfig options, effectively reversing the dependency order.
Change-Id: If15436817ba664398055e9efc6c7c656de3bf3e4
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55758
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Diffstat (limited to 'src/arch')
-rw-r--r-- | src/arch/x86/Kconfig | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 6a25daeed2..1003376dee 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -6,19 +6,18 @@ config ARCH_X86 select RELOCATABLE_MODULES select HAVE_ASAN_IN_RAMSTAGE +if ARCH_X86 + # stage selectors for x86 config ARCH_BOOTBLOCK_X86_32 bool - select ARCH_X86 config ARCH_VERSTAGE_X86_32 bool - select ARCH_X86 config ARCH_ROMSTAGE_X86_32 bool - select ARCH_X86 config ARCH_POSTCAR_X86_32 bool @@ -26,7 +25,6 @@ config ARCH_POSTCAR_X86_32 config ARCH_RAMSTAGE_X86_32 bool - select ARCH_X86 config ARCH_ALL_STAGES_X86_32 bool @@ -39,15 +37,12 @@ config ARCH_ALL_STAGES_X86_32 config ARCH_BOOTBLOCK_X86_64 bool - select ARCH_X86 config ARCH_VERSTAGE_X86_64 bool - select ARCH_X86 config ARCH_ROMSTAGE_X86_64 bool - select ARCH_X86 config ARCH_POSTCAR_X86_64 bool @@ -55,7 +50,6 @@ config ARCH_POSTCAR_X86_64 config ARCH_RAMSTAGE_X86_64 bool - select ARCH_X86 config ARCH_ALL_STAGES_X86_64 bool @@ -64,8 +58,6 @@ config ARCH_ALL_STAGES_X86_64 select ARCH_ROMSTAGE_X86_64 select ARCH_RAMSTAGE_X86_64 -if ARCH_X86 - config ARCH_X86_64_PGTBL_LOC hex "x86_64 page table location in CBFS" depends on ARCH_BOOTBLOCK_X86_64 |