From b3af349284c3fbe14ee55c48652fb46ddeb80484 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Mon, 10 Jun 2019 11:33:40 +0200 Subject: soc/intel/block/cpu: remove unused USE_COREBOOT_NATIVE_MP_INIT Only CONFIG_USE_INTEL_FSP_MP_INIT makes a difference whether native MP init is used or not. Also make USE_INTEL_FSP_MP_INIT mutually exclusive with USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI as this option requires coreboot to set up AP and publish PPI based on it. Change-Id: I65b80805d3cd7b66f8c9f878d3c741b98f24288d Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/33357 Reviewed-by: Angel Pons Reviewed-by: Nico Huber Tested-by: build bot (Jenkins) --- Documentation/soc/intel/mp_init/mp_init.md | 6 +++--- src/soc/intel/common/block/cpu/Kconfig | 13 +------------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Documentation/soc/intel/mp_init/mp_init.md b/Documentation/soc/intel/mp_init/mp_init.md index f81ffc143e..7284e8a1c5 100644 --- a/Documentation/soc/intel/mp_init/mp_init.md +++ b/Documentation/soc/intel/mp_init/mp_init.md @@ -27,9 +27,9 @@ Considering these facts, there are 3 possible solutions to perform MP initialization from coreboot + FSP space. 1. coreboot to perform complete MP initialization by its own. This includes -BSP and AP programming of CPU features mostly non-restricted one. Preferred -Kconfig is USE_COREBOOT_NATIVE_MP_INIT. SoCs like SKL, KBL, APL are okay to -make use of same Kconfig option for MP initialization. +BSP and AP programming of CPU features mostly non-restricted one. This is +the default configuration. Most SoCs like SKL, KBL, APL are okay to make use +of this MP initialization method. 2. Alternatively, SoC users also can skip coreboot doing MP initialization and make use of FSP binary to perform same task. This can be achieved by using diff --git a/src/soc/intel/common/block/cpu/Kconfig b/src/soc/intel/common/block/cpu/Kconfig index 9ec5307e48..8cc572d3b2 100644 --- a/src/soc/intel/common/block/cpu/Kconfig +++ b/src/soc/intel/common/block/cpu/Kconfig @@ -51,18 +51,10 @@ config INTEL_CAR_NEM_ENHANCED 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 - bool "Perform MP Initialization by coreboot" - default y if !PLATFORM_USES_FSP2_1 - default n - help - This option allows user to select native coreboot option to perform - multiprocessor initialization. - config USE_INTEL_FSP_MP_INIT bool "Perform MP Initialization by FSP" default n + depends on !USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI help This option allows FSP to perform multiprocessor initialization. @@ -71,9 +63,6 @@ config USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI depends on FSP_USES_MP_SERVICES_PPI default y if PLATFORM_USES_FSP2_1 default n - 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 -- cgit v1.2.3