Mimoja has uploaded this change for review.

View Change

drivers/intel: Make FSP_USE_REPO an SOC optin instead of list dependency

For quite a bit now we are extending the FSP_USE_REPO option to be
available for all Intel SOCs. This results in an list beeing not only
hard to maintain but also prune to errors.
To change that behaviour this commit is introducing the
HAVE_INTEL_FSP_REPO config for SOCs that are supported from withing
3rdparty/fsp.
All other interactions with FSP_USE_REPO stay the same.

Change-Id: I68ae373ce591f06073064aa75aac32ceca8fa1cc
Signed-off-by: Johanna Schander <coreboot@mimoja.de>
---
M src/drivers/intel/fsp2_0/Kconfig
M src/soc/intel/Kconfig
M src/soc/intel/apollolake/Kconfig
M src/soc/intel/cannonlake/Kconfig
M src/soc/intel/denverton_ns/Kconfig
M src/soc/intel/icelake/Kconfig
M src/soc/intel/skylake/Kconfig
7 files changed, 11 insertions(+), 4 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/82/37582/1

diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig
index 8c8ac59..9d1aa88 100644
--- a/src/drivers/intel/fsp2_0/Kconfig
+++ b/src/drivers/intel/fsp2_0/Kconfig
@@ -53,10 +53,7 @@
 config FSP_USE_REPO
 	bool "Use the IntelFSP based binaries"
 	depends on ADD_FSP_BINARIES
-	depends on SOC_INTEL_APOLLOLAKE || SOC_INTEL_SKYLAKE || \
-		SOC_INTEL_KABYLAKE || SOC_INTEL_COFFEELAKE || \
-		SOC_INTEL_ICELAKE  || SOC_INTEL_WHISKEYLAKE || \
-		SOC_INTEL_DENVERTON_NS
+	depends on HAVE_INTEL_FSP_REPO
 	help
 	  When selecting this option, the SoC must set FSP_HEADER_PATH
 	  and FSP_FD_PATH correctly so FSP splitting works.
diff --git a/src/soc/intel/Kconfig b/src/soc/intel/Kconfig
index 1eebeb6..16f43df 100644
--- a/src/soc/intel/Kconfig
+++ b/src/soc/intel/Kconfig
@@ -46,3 +46,8 @@
 	  than the one in non-topswap bootblock. This string will be passed
 	  onto ifittool (-A -n option). ifittool will not parse the region for MCU
 	  entries, and only locate the region and insert its address into FIT.
+
+config HAVE_INTEL_FSP_REPO
+	bool "Use FSP Blobs from fsp submodule"
+	help
+	  This SOC has FSP binaries living in 3rdparty/fsp.
diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig
index 0b3b30a..8dc7628 100644
--- a/src/soc/intel/apollolake/Kconfig
+++ b/src/soc/intel/apollolake/Kconfig
@@ -44,6 +44,7 @@
 	select GENERIC_GPIO_LIB
 	select INTEL_DESCRIPTOR_MODE_CAPABLE
 	select HAVE_SMI_HANDLER
+	select HAVE_INTEL_FSP_REPO
 	select MRC_SETTINGS_PROTECT
 	select MRC_SETTINGS_VARIABLE_DATA
 	select NO_FIXED_XIP_ROM_SIZE
diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig
index 40c2fd7..8b55ac7 100644
--- a/src/soc/intel/cannonlake/Kconfig
+++ b/src/soc/intel/cannonlake/Kconfig
@@ -64,6 +64,7 @@
 	select CPU_INTEL_FIRMWARE_INTERFACE_TABLE
 	select FSP_M_XIP
 	select GENERIC_GPIO_LIB
+	select HAVE_INTEL_FSP_REPO
 	select HAVE_FSP_GOP
 	select INTEL_DESCRIPTOR_MODE_CAPABLE
 	select HAVE_SMI_HANDLER
diff --git a/src/soc/intel/denverton_ns/Kconfig b/src/soc/intel/denverton_ns/Kconfig
index 9445977..0289cf4 100644
--- a/src/soc/intel/denverton_ns/Kconfig
+++ b/src/soc/intel/denverton_ns/Kconfig
@@ -33,6 +33,7 @@
 	select SOC_INTEL_COMMON_RESET
 	select PLATFORM_USES_FSP2_0
 	select IOAPIC
+	select HAVE_INTEL_FSP_REPO
 	select HAVE_SMI_HANDLER
 	select CACHE_MRC_SETTINGS
 	select PARALLEL_MP
diff --git a/src/soc/intel/icelake/Kconfig b/src/soc/intel/icelake/Kconfig
index 4077619..1dd8bf1 100644
--- a/src/soc/intel/icelake/Kconfig
+++ b/src/soc/intel/icelake/Kconfig
@@ -20,6 +20,7 @@
 	select FSP_M_XIP
 	select GENERIC_GPIO_LIB
 	select HAVE_FSP_GOP
+	select HAVE_INTEL_FSP_REPO
 	select INTEL_DESCRIPTOR_MODE_CAPABLE
 	select HAVE_SMI_HANDLER
 	select IDT_IN_EVERY_STAGE
diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig
index 31f809a..cde9909 100644
--- a/src/soc/intel/skylake/Kconfig
+++ b/src/soc/intel/skylake/Kconfig
@@ -38,6 +38,7 @@
 	select INTEL_CAR_NEM_ENHANCED
 	select INTEL_GMA_ACPI
 	select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
+	select HAVE_INTEL_FSP_REPO
 	select IOAPIC
 	select MRC_SETTINGS_PROTECT
 	select NO_FIXED_XIP_ROM_SIZE

To view, visit change 37582. To unsubscribe, or for help writing mail filters, visit settings.