From a49a2074a91bb68eda5e7b75c2bcb4a3a50d00ab Mon Sep 17 00:00:00 2001 From: Naresh G Solanki Date: Mon, 17 Oct 2016 17:21:08 +0530 Subject: [PATCH] UPSTREAM: 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. BUG=None BRANCH=None TEST=None Signed-off-by: Naresh G Solanki Signed-off-by: Rizwan Qureshi Reviewed-on: https://review.coreboot.org/17044 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin Change-Id: I724aaa87c2b0b8f6ddb18f61af9c37176ef632f2 Reviewed-on: https://chromium-review.googlesource.com/400801 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- 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 3c843f505f..5a1d878f90 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