soc/intel/apl: Use Kconfig to enable CseRbp

This patch makes SKIP_CSE_RBP=y default for Apollo Lake if Boot Device is
memory mapped and ensures SkipCseRbp UPD is guarded against this config.

Signed-off-by: Sean Rhodes <sean@starlabs.systems>
Change-Id: Ifd01a25443e2582a90529e55be8d34a88342a103
Reviewed-on: https://review.coreboot.org/c/coreboot/+/61282
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Sean Rhodes 2022-01-20 21:28:31 +00:00 committed by Felix Held
parent eaee04b4a1
commit fafcb749b4
2 changed files with 10 additions and 8 deletions

View File

@ -117,6 +117,15 @@ config CPU_SPECIFIC_OPTIONS
# provide a custom media driver that facilitates mapping # provide a custom media driver that facilitates mapping
select X86_CUSTOM_BOOTMEDIA select X86_CUSTOM_BOOTMEDIA
config SKIP_CSE_RBP
bool
default y if BOOT_DEVICE_MEMORY_MAPPED
help
Tell CSE we do not need to use Ring Buffer Protocol (RBP) to fetch
firmware for us if we are using memory-mapped SPI. This lets CSE
state machine transition to next boot state, so that it can function
as designed.
config DISABLE_HECI1_AT_PRE_BOOT config DISABLE_HECI1_AT_PRE_BOOT
default y default y

View File

@ -293,14 +293,7 @@ void platform_fsp_memory_init_params_cb(FSPM_UPD *mupd, uint32_t version)
/* Do NOT let FSP do any GPIO pad configuration */ /* Do NOT let FSP do any GPIO pad configuration */
mupd->FspmConfig.PreMemGpioTablePtr = (uintptr_t) NULL; mupd->FspmConfig.PreMemGpioTablePtr = (uintptr_t) NULL;
/* mupd->FspmConfig.SkipCseRbp = CONFIG(SKIP_CSE_RBP);
* Tell CSE we do not need to use Ring Buffer Protocol (RBP) to fetch
* firmware for us if we are using memory-mapped SPI. This lets CSE
* state machine transition to next boot state, so that it can function
* as designed.
*/
mupd->FspmConfig.SkipCseRbp =
CONFIG(BOOT_DEVICE_MEMORY_MAPPED);
/* /*
* Converged Security Engine (CSE) has secure storage functionality. * Converged Security Engine (CSE) has secure storage functionality.