As the code is today, we get a warning about "select" statements on "choice" options not doing anything. In this case, we move to having a "default FSP_VERSION2 if INTEL_APOLLOLAKE" in order to get the desired outcome.
Signed-off-by: Tom Rini <[email protected]> --- arch/x86/Kconfig | 1 + arch/x86/cpu/apollolake/Kconfig | 1 - configs/chromebook_coral_defconfig | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 006a59d6fa63..9f33cc75501a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -382,6 +382,7 @@ config USE_CAR choice prompt "FSP version" depends on HAVE_FSP + default FSP_VERSION2 if INTEL_APOLLOLAKE default FSP_VERSION1 help Selects the FSP version to use. Intel has published several versions diff --git a/arch/x86/cpu/apollolake/Kconfig b/arch/x86/cpu/apollolake/Kconfig index c7f26d171cb0..5dd866ffcfe4 100644 --- a/arch/x86/cpu/apollolake/Kconfig +++ b/arch/x86/cpu/apollolake/Kconfig @@ -5,7 +5,6 @@ config INTEL_APOLLOLAKE bool - select FSP_VERSION2 select HAVE_FSP select ARCH_MISC_INIT select USE_CAR diff --git a/configs/chromebook_coral_defconfig b/configs/chromebook_coral_defconfig index 93e3355219b7..3d5d3619a141 100644 --- a/configs/chromebook_coral_defconfig +++ b/configs/chromebook_coral_defconfig @@ -16,7 +16,6 @@ CONFIG_DEBUG_UART_BOARD_INIT=y CONFIG_VENDOR_GOOGLE=y CONFIG_TARGET_CHROMEBOOK_CORAL=y CONFIG_DEBUG_UART=y -CONFIG_FSP_VERSION2=y CONFIG_HAVE_ACPI_RESUME=y CONFIG_INTEL_CAR_CQOS=y CONFIG_X86_OFFSET_U_BOOT=0xffd00000 -- 2.43.0
