Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/33357
Change subject: soc/intel/block/cpu: Make MP init options mutually exclusive ......................................................................
soc/intel/block/cpu: Make MP init options mutually exclusive
It shouldn't be the case that multiple or no MP init paths could be selected.
Change-Id: I65b80805d3cd7b66f8c9f878d3c741b98f24288d Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/soc/intel/common/block/cpu/Kconfig 1 file changed, 30 insertions(+), 10 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/57/33357/1
diff --git a/src/soc/intel/common/block/cpu/Kconfig b/src/soc/intel/common/block/cpu/Kconfig index 9ec5307..e602829 100644 --- a/src/soc/intel/common/block/cpu/Kconfig +++ b/src/soc/intel/common/block/cpu/Kconfig @@ -51,29 +51,49 @@ ENHANCED NEM guarantees that modified data is always kept in cache while clean data is replaced.
-menu "Multiple Processor (MP) Initialization Options" -config USE_COREBOOT_NATIVE_MP_INIT +choice + prompt "Multiple Processor (MP) Initialization Options" + default MP_USE_COREBOOT_NATIVE_MP_INIT if !PLATFORM_USES_FSP2_1 + default MP_USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI if PLATFORM_USES_FSP2_1 + +config MP_USE_COREBOOT_NATIVE_MP_INIT bool "Perform MP Initialization by coreboot" - default y if !PLATFORM_USES_FSP2_1 - default n + select USE_COREBOOT_NATIVE_MP_INIT help This option allows user to select native coreboot option to perform multiprocessor initialization.
-config USE_INTEL_FSP_MP_INIT +config MP_USE_INTEL_FSP_MP_INIT bool "Perform MP Initialization by FSP" - default n + select USE_INTEL_FSP_MP_INIT help This option allows FSP to perform multiprocessor initialization.
-config USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI +config MP_USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI bool "Perform MP Initialization by FSP using coreboot MP PPI service" depends on FSP_USES_MP_SERVICES_PPI - default y if PLATFORM_USES_FSP2_1 - default n + select USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI select USE_COREBOOT_NATIVE_MP_INIT help This option allows FSP to make use of MP services PPI published by coreboot to perform multiprocessor initialization.
-endmenu # Multiple Processor (MP) Initialization Options +endchoice + +config USE_COREBOOT_NATIVE_MP_INIT + bool + help + This option allows user to select native coreboot option to perform + multiprocessor initialization. + +config USE_INTEL_FSP_MP_INIT + bool + help + This option allows FSP to perform multiprocessor initialization. + +config USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI + bool + select USE_COREBOOT_NATIVE_MP_INIT + help + This option allows FSP to make use of MP services PPI published by + coreboot to perform multiprocessor initialization.