diff options
| -rw-r--r-- | src/drivers/intel/fsp2_0/Kconfig | 27 | ||||
| -rw-r--r-- | src/soc/intel/Kconfig | 6 | ||||
| -rw-r--r-- | src/soc/intel/apollolake/Kconfig | 3 | ||||
| -rw-r--r-- | src/soc/intel/cannonlake/Kconfig | 3 | ||||
| -rw-r--r-- | src/soc/intel/denverton_ns/Kconfig | 3 | ||||
| -rw-r--r-- | src/soc/intel/icelake/Kconfig | 3 | ||||
| -rw-r--r-- | src/soc/intel/jasperlake/Kconfig | 3 | ||||
| -rw-r--r-- | src/soc/intel/skylake/Kconfig | 3 | ||||
| -rw-r--r-- | src/soc/intel/tigerlake/Kconfig | 3 |
9 files changed, 25 insertions, 29 deletions
diff --git a/src/drivers/intel/fsp2_0/Kconfig b/src/drivers/intel/fsp2_0/Kconfig index b3b99bdbe0..27c0803ad6 100644 --- a/src/drivers/intel/fsp2_0/Kconfig +++ b/src/drivers/intel/fsp2_0/Kconfig @@ -31,13 +31,36 @@ config PLATFORM_USES_FSP2_1 if PLATFORM_USES_FSP2_0 +config HAVE_INTEL_FSP_REPO + bool + help + Select this, if the FSP binaries for the platform are public + and available in 3rdparty/fsp/. When selecting this option, the + platform must also set FSP_HEADER_PATH and FSP_FD_PATH correctly. + config FSP_USE_REPO bool "Use binaries of the Intel FSP repository on GitHub" depends on HAVE_INTEL_FSP_REPO default y help - When selecting this option, the SoC must set FSP_HEADER_PATH - and FSP_FD_PATH correctly so FSP splitting works. + Select this option to use the default FSP headers and binaries + found in the IntelFsp GitHub repository at + + https://github.com/IntelFsp/FSP/ + + If unsure, say Y. + +config FSP_HEADER_PATH + string "Location of FSP headers" if !FSP_USE_REPO + help + Include directory with the FSP ABI header files. + +config FSP_FD_PATH + string + depends on FSP_USE_REPO + help + Path to the FSP FD file that contains the individual FSP-T, FSP-M + and FSP-S binaries. config ADD_FSP_BINARIES bool "Add Intel FSP 2.0 binaries to CBFS" if !FSP_USE_REPO diff --git a/src/soc/intel/Kconfig b/src/soc/intel/Kconfig index 75f2f7090e..d5190683ae 100644 --- a/src/soc/intel/Kconfig +++ b/src/soc/intel/Kconfig @@ -38,9 +38,3 @@ config INTEL_TOP_SWAP_FIT_ENTRY_FMAP_REG 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 - help - Select this, if the FSP binaries for the platform are public available - in 3rdparty/fsp. diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index e5ab28c2fe..91e5bb64b3 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -182,13 +182,10 @@ config VERSTAGE_ADDR The base address (in CAR) where verstage should be linked config FSP_HEADER_PATH - string "Location of FSP headers" default "src/vendorcode/intel/fsp/fsp2_0/glk" if SOC_INTEL_GLK default "3rdparty/fsp/ApolloLakeFspBinPkg/Include/" config FSP_FD_PATH - string - depends on FSP_USE_REPO default "3rdparty/fsp/ApolloLakeFspBinPkg/FspBin/Fsp.fd" config FSP_M_ADDR diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index baf8756385..889aa00b21 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -310,14 +310,11 @@ config USE_CANNONLAKE_FSP_CAR endchoice config FSP_HEADER_PATH - string "Location of FSP headers" default "3rdparty/fsp/CoffeeLakeFspBinPkg/Include/" if SOC_INTEL_COFFEELAKE || SOC_INTEL_WHISKEYLAKE default "3rdparty/fsp/CometLakeFspBinPkg/CometLake1/Include/" if SOC_INTEL_COMETLAKE default "src/vendorcode/intel/fsp/fsp2_0/cannonlake/" if SOC_INTEL_CANNONLAKE config FSP_FD_PATH - string - depends on FSP_USE_REPO default "3rdparty/fsp/CoffeeLakeFspBinPkg/Fsp.fd" if SOC_INTEL_COFFEELAKE || SOC_INTEL_WHISKEYLAKE default "3rdparty/fsp/CometLakeFspBinPkg/CometLake1/FSP.fd" if SOC_INTEL_COMETLAKE diff --git a/src/soc/intel/denverton_ns/Kconfig b/src/soc/intel/denverton_ns/Kconfig index c628dbd7b5..5f2c5aa881 100644 --- a/src/soc/intel/denverton_ns/Kconfig +++ b/src/soc/intel/denverton_ns/Kconfig @@ -81,12 +81,9 @@ config FSP_S_ADDR The memory location of the Intel FSP-S binary for this platform. config FSP_HEADER_PATH - string default "3rdparty/fsp/DenvertonNSFspBinPkg/Include/" config FSP_FD_PATH - string - depends on FSP_USE_REPO default "3rdparty/fsp/DenvertonNSFspBinPkg/FspBin/DenvertonNSFsp.fd" # CAR memory layout on DENVERTON_NS hardware: diff --git a/src/soc/intel/icelake/Kconfig b/src/soc/intel/icelake/Kconfig index 559ba6c801..4193128a64 100644 --- a/src/soc/intel/icelake/Kconfig +++ b/src/soc/intel/icelake/Kconfig @@ -179,12 +179,9 @@ config CBFS_SIZE default 0x200000 config FSP_HEADER_PATH - string "Location of FSP headers" default "3rdparty/fsp/IceLakeFspBinPkg/Include" config FSP_FD_PATH - string - depends on FSP_USE_REPO default "3rdparty/fsp/IceLakeFspBinPkg/Fsp.fd" config SOC_INTEL_ICELAKE_DEBUG_CONSENT diff --git a/src/soc/intel/jasperlake/Kconfig b/src/soc/intel/jasperlake/Kconfig index 844a954996..8c2dd779b4 100644 --- a/src/soc/intel/jasperlake/Kconfig +++ b/src/soc/intel/jasperlake/Kconfig @@ -184,12 +184,9 @@ config CBFS_SIZE default 0x200000 config FSP_HEADER_PATH - string "Location of FSP headers" default "src/vendorcode/intel/fsp/fsp2_0/jasperlake/" config FSP_FD_PATH - string - depends on FSP_USE_REPO default "3rdparty/fsp/JasperLakeFspBinPkg/Fsp.fd" config SOC_INTEL_JASPERLAKE_DEBUG_CONSENT diff --git a/src/soc/intel/skylake/Kconfig b/src/soc/intel/skylake/Kconfig index 2beda43c7c..4df64beb5e 100644 --- a/src/soc/intel/skylake/Kconfig +++ b/src/soc/intel/skylake/Kconfig @@ -222,14 +222,11 @@ config NHLT_DA7219 Include DSP firmware settings for DA7219 headset codec. config FSP_HEADER_PATH - string "Location of FSP headers" # Use KabylakeFsp for both Skylake and Kabylake as it supports both. # SkylakeFsp is FSP 1.1 and therefore incompatible. default "3rdparty/fsp/KabylakeFspBinPkg/Include/" config FSP_FD_PATH - string - depends on FSP_USE_REPO default "3rdparty/fsp/KabylakeFspBinPkg/Fsp.fd" config MAX_ROOT_PORTS diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index 77d22ca946..a690acf9dc 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -184,12 +184,9 @@ config CBFS_SIZE default 0x200000 config FSP_HEADER_PATH - string "Location of FSP headers" default "src/vendorcode/intel/fsp/fsp2_0/tigerlake/" config FSP_FD_PATH - string - depends on FSP_USE_REPO default "3rdparty/fsp/TigerLakeFspBinPkg/Fsp.fd" config SOC_INTEL_TIGERLAKE_DEBUG_CONSENT |