cpu/x86: Default to PARALLEL_MP selected
Change-Id: I9833c4f6c43b3e67f95bd465c42d7a5036dff914
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55196
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
diff --git a/src/cpu/intel/haswell/Kconfig b/src/cpu/intel/haswell/Kconfig
index 0d3d132..8d08bd9 100644
--- a/src/cpu/intel/haswell/Kconfig
+++ b/src/cpu/intel/haswell/Kconfig
@@ -16,7 +16,6 @@
#select AP_IN_SIPI_WAIT
select TSC_SYNC_MFENCE
select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
- select PARALLEL_MP
select CPU_INTEL_COMMON
select CPU_INTEL_COMMON_TIMEBASE
select HAVE_ASAN_IN_ROMSTAGE
diff --git a/src/cpu/intel/model_2065x/Kconfig b/src/cpu/intel/model_2065x/Kconfig
index 04b9e67..31105ec 100644
--- a/src/cpu/intel/model_2065x/Kconfig
+++ b/src/cpu/intel/model_2065x/Kconfig
@@ -16,7 +16,6 @@
select TSC_SYNC_MFENCE
select CPU_INTEL_COMMON
select CPU_INTEL_COMMON_TIMEBASE
- select PARALLEL_MP
config SMM_TSEG_SIZE
hex
diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig
index 5098ac7..cf6a907 100644
--- a/src/cpu/intel/model_206ax/Kconfig
+++ b/src/cpu/intel/model_206ax/Kconfig
@@ -16,7 +16,6 @@
select TSC_SYNC_MFENCE
select CPU_INTEL_COMMON
select CPU_INTEL_COMMON_TIMEBASE
- select PARALLEL_MP
config SMM_TSEG_SIZE
hex
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig
index 85f99e9..f6ccb88 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -15,10 +15,10 @@
config CPU_QEMU_X86_LAPIC_INIT
bool "Legacy serial LAPIC init"
+ select LEGACY_SMP_INIT
config CPU_QEMU_X86_PARALLEL_MP
bool "Parallel MP init"
- select PARALLEL_MP
endchoice
@@ -33,13 +33,13 @@
config CPU_QEMU_X86_ASEG_SMM
bool "SMM in ASEG"
- depends on !PARALLEL_MP
+ depends on CPU_QEMU_X86_LAPIC_INIT
select SMM_ASEG
config CPU_QEMU_X86_TSEG_SMM
bool "SMM in TSEG"
select SMM_TSEG
- depends on PARALLEL_MP
+ depends on CPU_QEMU_X86_PARALLEL_MP
endchoice
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index bcaf0bf..1a4318c 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -4,7 +4,9 @@
default n
config PARALLEL_MP
- def_bool n
+ def_bool y
+ depends on !LEGACY_SMP_INIT
+ depends on SMP
help
This option uses common MP infrastructure for bringing up APs
in parallel. It additionally provides a more flexible mechanism
@@ -17,6 +19,9 @@
Allow APs to do other work after initialization instead of going
to sleep.
+config LEGACY_SMP_INIT
+ bool
+
config UDELAY_LAPIC
bool
default n