summaryrefslogtreecommitdiff
path: root/src/soc/amd/common
diff options
context:
space:
mode:
authorFelix Held <felix.held@amd.corp-partner.google.com>2021-10-14 21:43:11 +0200
committerFelix Held <felix-coreboot@felixheld.de>2021-10-15 20:04:44 +0000
commit4e379a237466f4c96546a758ae86f17c7d26eed6 (patch)
treedae831377238a44ec8f15f7a3da08877a9985f61 /src/soc/amd/common
parentf38fbbec2c0061d122466cec346c2634aa26e236 (diff)
soc/amd: make configure_espi_with_mb_hook call conditional
If a system doesn't use eSPI or has the eSPI interface already configured in verstage on PSP, not calling configure_espi_with_mb_hook from fch_pre_init makes it a bit more obvious that the eSPI interface initialization will be skipped. Signed-off-by: Felix Held <felix-coreboot@felixheld.de> Change-Id: Ia77b83d56a5dab1bac6cfbbd92d33aa60a9e8b89 Reviewed-on: https://review.coreboot.org/c/coreboot/+/58339 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Raul Rangel <rrangel@chromium.org>
Diffstat (limited to 'src/soc/amd/common')
-rw-r--r--src/soc/amd/common/block/include/amdblocks/espi.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/soc/amd/common/block/include/amdblocks/espi.h b/src/soc/amd/common/block/include/amdblocks/espi.h
index 0f8066b2a6..e12b1b8486 100644
--- a/src/soc/amd/common/block/include/amdblocks/espi.h
+++ b/src/soc/amd/common/block/include/amdblocks/espi.h
@@ -134,12 +134,8 @@ void mb_set_up_early_espi(void);
/* Setup eSPI with any mainboard specific initialization. */
static inline void configure_espi_with_mb_hook(void)
{
- /* If eSPI is setup in PSP Verstage, continue with that. Else setup eSPI to perform
- port80h routing as early as possible. */
- if (!CONFIG(VBOOT_STARTS_BEFORE_BOOTBLOCK) && CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI)) {
- mb_set_up_early_espi();
- espi_setup();
- }
+ mb_set_up_early_espi();
+ espi_setup();
}
#endif /* AMD_BLOCK_ESPI_H */