intel/fsp2_0: Make FSP_USE_REPO a SoC opt-in
For quite a bit now we are extending the FSP_USE_REPO option to be available for all Intel SoCs. This results in a list being not only hard to maintain but also prone to errors. To change that behaviour this commit introduces the HAVE_INTEL_FSP_REPO config option for SoCs that are supported from within 3rdparty/fsp. If a SoC selects HAVE_INTEL_FSP_REPO the config option FSP_USE_REPO is selected by default, but can be still deselected by the user in menuconfig. Change-Id: I68ae373ce591f06073064aa75aac32ceca8fa1cc Signed-off-by: Johanna Schander <coreboot@mimoja.de> Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37582 Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Nico Huber <nico.h@gmx.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
parent
e5565c45cb
commit
8a6e036861
|
@ -53,10 +53,8 @@ config FSP_M_CBFS
|
||||||
config FSP_USE_REPO
|
config FSP_USE_REPO
|
||||||
bool "Use the IntelFSP based binaries"
|
bool "Use the IntelFSP based binaries"
|
||||||
depends on ADD_FSP_BINARIES
|
depends on ADD_FSP_BINARIES
|
||||||
depends on SOC_INTEL_APOLLOLAKE || SOC_INTEL_SKYLAKE || \
|
depends on HAVE_INTEL_FSP_REPO
|
||||||
SOC_INTEL_KABYLAKE || SOC_INTEL_COFFEELAKE || \
|
default y
|
||||||
SOC_INTEL_ICELAKE || SOC_INTEL_WHISKEYLAKE || \
|
|
||||||
SOC_INTEL_DENVERTON_NS || SOC_INTEL_COMETLAKE
|
|
||||||
help
|
help
|
||||||
When selecting this option, the SoC must set FSP_HEADER_PATH
|
When selecting this option, the SoC must set FSP_HEADER_PATH
|
||||||
and FSP_FD_PATH correctly so FSP splitting works.
|
and FSP_FD_PATH correctly so FSP splitting works.
|
||||||
|
|
|
@ -38,3 +38,9 @@ config INTEL_TOP_SWAP_FIT_ENTRY_FMAP_REG
|
||||||
than the one in non-topswap bootblock. This string will be passed
|
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
|
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.
|
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.
|
||||||
|
|
|
@ -44,6 +44,7 @@ config CPU_SPECIFIC_OPTIONS
|
||||||
select GENERIC_GPIO_LIB
|
select GENERIC_GPIO_LIB
|
||||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||||
select HAVE_SMI_HANDLER
|
select HAVE_SMI_HANDLER
|
||||||
|
select HAVE_INTEL_FSP_REPO
|
||||||
select MRC_SETTINGS_PROTECT
|
select MRC_SETTINGS_PROTECT
|
||||||
select MRC_SETTINGS_VARIABLE_DATA
|
select MRC_SETTINGS_VARIABLE_DATA
|
||||||
select NO_XIP_EARLY_STAGES
|
select NO_XIP_EARLY_STAGES
|
||||||
|
|
|
@ -24,6 +24,7 @@ config SOC_INTEL_COFFEELAKE
|
||||||
bool
|
bool
|
||||||
select SOC_INTEL_CANNONLAKE_BASE
|
select SOC_INTEL_CANNONLAKE_BASE
|
||||||
select FSP_USES_CB_STACK
|
select FSP_USES_CB_STACK
|
||||||
|
select HAVE_INTEL_FSP_REPO
|
||||||
help
|
help
|
||||||
Intel Coffeelake support
|
Intel Coffeelake support
|
||||||
|
|
||||||
|
@ -31,6 +32,7 @@ config SOC_INTEL_WHISKEYLAKE
|
||||||
bool
|
bool
|
||||||
select SOC_INTEL_CANNONLAKE_BASE
|
select SOC_INTEL_CANNONLAKE_BASE
|
||||||
select FSP_USES_CB_STACK
|
select FSP_USES_CB_STACK
|
||||||
|
select HAVE_INTEL_FSP_REPO
|
||||||
help
|
help
|
||||||
Intel Whiskeylake support
|
Intel Whiskeylake support
|
||||||
|
|
||||||
|
@ -39,6 +41,7 @@ config SOC_INTEL_COMETLAKE
|
||||||
select SOC_INTEL_CANNONLAKE_BASE
|
select SOC_INTEL_CANNONLAKE_BASE
|
||||||
select MICROCODE_BLOB_UNDISCLOSED
|
select MICROCODE_BLOB_UNDISCLOSED
|
||||||
select FSP_USES_CB_STACK
|
select FSP_USES_CB_STACK
|
||||||
|
select HAVE_INTEL_FSP_REPO
|
||||||
help
|
help
|
||||||
Intel Cometlake support
|
Intel Cometlake support
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@ config CPU_SPECIFIC_OPTIONS
|
||||||
select SOC_INTEL_COMMON_RESET
|
select SOC_INTEL_COMMON_RESET
|
||||||
select PLATFORM_USES_FSP2_0
|
select PLATFORM_USES_FSP2_0
|
||||||
select IOAPIC
|
select IOAPIC
|
||||||
|
select HAVE_INTEL_FSP_REPO
|
||||||
select HAVE_SMI_HANDLER
|
select HAVE_SMI_HANDLER
|
||||||
select CACHE_MRC_SETTINGS
|
select CACHE_MRC_SETTINGS
|
||||||
select PARALLEL_MP
|
select PARALLEL_MP
|
||||||
|
|
|
@ -20,6 +20,7 @@ config CPU_SPECIFIC_OPTIONS
|
||||||
select FSP_M_XIP
|
select FSP_M_XIP
|
||||||
select GENERIC_GPIO_LIB
|
select GENERIC_GPIO_LIB
|
||||||
select HAVE_FSP_GOP
|
select HAVE_FSP_GOP
|
||||||
|
select HAVE_INTEL_FSP_REPO
|
||||||
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
select INTEL_DESCRIPTOR_MODE_CAPABLE
|
||||||
select HAVE_SMI_HANDLER
|
select HAVE_SMI_HANDLER
|
||||||
select IDT_IN_EVERY_STAGE
|
select IDT_IN_EVERY_STAGE
|
||||||
|
|
|
@ -39,6 +39,7 @@ config CPU_SPECIFIC_OPTIONS
|
||||||
select INTEL_CAR_NEM_ENHANCED
|
select INTEL_CAR_NEM_ENHANCED
|
||||||
select INTEL_GMA_ACPI
|
select INTEL_GMA_ACPI
|
||||||
select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
|
select INTEL_GMA_ADD_VBT if RUN_FSP_GOP
|
||||||
|
select HAVE_INTEL_FSP_REPO
|
||||||
select IOAPIC
|
select IOAPIC
|
||||||
select MRC_SETTINGS_PROTECT
|
select MRC_SETTINGS_PROTECT
|
||||||
select PARALLEL_MP
|
select PARALLEL_MP
|
||||||
|
|
Loading…
Reference in New Issue