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
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -390,6 +390,7 @@
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
--- 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