x86: Correct usage of FSP_VERSION2

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 <trini@konsulko.com>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index dc9483a..6ca0605 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -390,6 +390,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 c7f26d1..5dd866f 100644 (file)
--- 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 93e3355..3d5d361 100644 (file)
--- 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