[coreboot-gerrit] Patch set updated for coreboot: soc/intel/skylake: Allow selecting FSP driver in Kconfig

[Naresh Solanki (naresh.solanki@intel.com)]

Naresh Solanki (naresh.solanki at intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17044

-gerrit

commit 4bcdd8e33a6c0869c0bc9a2267918fbc10bed620
Author: Naresh G Solanki <naresh.solanki at intel.com>
Date:   Mon Oct 17 17:21:08 2016 +0530

    soc/intel/skylake: Allow selecting FSP driver in Kconfig
    
    Enable mainboard Kconfig to select between FSP 2.0 & 1.1 driver to be
    used.
    
    If mainboard Kconfig selects MAINBOARD_USES_FSP2_0 the FSP2_0 driver is
    used else FSP1_1.
    
    Change-Id: I724aaa87c2b0b8f6ddb18f61af9c37176ef632f2
    Signed-off-by: Naresh G Solanki <naresh.solanki at intel.com>
    Signed-off-by: Rizwan Qureshi <rizwan.qureshi at intel.com>
---
 src/soc/intel/skylake/Kconfig | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 3c843f5..5a1d878 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -52,24 +52,26 @@ config CPU_SPECIFIC_OPTIONS
 	select TSC_SYNC_MFENCE
 	select UDELAY_TSC
 
-choice
-	prompt "FSP Driver"
-	default USE_FSP1_1_DRIVER
+config MAINBOARD_USES_FSP2_0
+	bool
+	default n
 
 config USE_FSP2_0_DRIVER
 	bool "Build with FSP 2.0"
+	depends on MAINBOARD_USES_FSP2_0
+	default y if MAINBOARD_USES_FSP2_0
 	select PLATFORM_USES_FSP2_0
 	select ADD_VBT_DATA_FILE
 	select SOC_INTEL_COMMON_GFX_OPREGION
 
 config USE_FSP1_1_DRIVER
 	bool "Build with FSP 1.1"
+	depends on !MAINBOARD_USES_FSP2_0
+	default y if !MAINBOARD_USES_FSP2_0
 	select PLATFORM_USES_FSP1_1
 	select GOP_SUPPORT
 	select DISPLAY_FSP_ENTRY_POINTS
 
-endchoice
-
 config CHROMEOS
 	select CHROMEOS_RAMOOPS_DYNAMIC
 	select EC_SOFTWARE_SYNC if EC_GOOGLE_CHROMEEC