Felix Held has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/58338 )
Change subject: soc/amd/common/include/espi: rename configure_espi ......................................................................
soc/amd/common/include/espi: rename configure_espi
Rename configure_espi to configure_espi_with_mb_hook to clarify that this function will call into the mb_set_up_early_espi function in the mainboard-specific code if it exists.
Signed-off-by: Felix Held felix-coreboot@felixheld.de Change-Id: I5d0f099288b0100242629c736dd69a8add977b5b --- M src/soc/amd/cezanne/early_fch.c M src/soc/amd/common/block/include/amdblocks/espi.h M src/soc/amd/picasso/early_fch.c 3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/38/58338/1
diff --git a/src/soc/amd/cezanne/early_fch.c b/src/soc/amd/cezanne/early_fch.c index 69458b6..f97f57c 100644 --- a/src/soc/amd/cezanne/early_fch.c +++ b/src/soc/amd/cezanne/early_fch.c @@ -41,7 +41,7 @@ /* Setup SPI base by calling lpc_early_init before setting up eSPI. */ lpc_early_init(); /* Setup eSPI to enable port80 routing. */ - configure_espi(); + configure_espi_with_mb_hook(); fch_spi_early_init(); fch_smbus_init(); fch_enable_cf9_io(); diff --git a/src/soc/amd/common/block/include/amdblocks/espi.h b/src/soc/amd/common/block/include/amdblocks/espi.h index 7e49ea0..0f8066b 100644 --- a/src/soc/amd/common/block/include/amdblocks/espi.h +++ b/src/soc/amd/common/block/include/amdblocks/espi.h @@ -132,7 +132,7 @@ void mb_set_up_early_espi(void);
/* Setup eSPI with any mainboard specific initialization. */ -static inline void configure_espi(void) +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. */ diff --git a/src/soc/amd/picasso/early_fch.c b/src/soc/amd/picasso/early_fch.c index 8771e38..83b4ae4 100644 --- a/src/soc/amd/picasso/early_fch.c +++ b/src/soc/amd/picasso/early_fch.c @@ -48,7 +48,7 @@ /* Setup SPI base by calling lpc_early_init before setting up eSPI. */ lpc_early_init(); /* Setup eSPI to enable port80 routing. */ - configure_espi(); + configure_espi_with_mb_hook();
if (!CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI)) lpc_configure_decodes();