From 9f17fa33f9eb393b71bff98cfbbac3501ad0d422 Mon Sep 17 00:00:00 2001
From: Felix Held <felix.held@amd.corp-partner.google.com>
Date: Mon, 20 Sep 2021 16:27:27 +0200
Subject: [PATCH] soc/amd/cezanne/early_fch: move mb_set_up_early_espi into if
 block

mb_set_up_early_espi should only be called when
SOC_AMD_COMMON_BLOCK_USE_ESPI is selected.

TEST=None

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ic8ad724a2a79c1995fbe9d97f11a0f69eed9435c
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57781
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
---
 src/soc/amd/cezanne/early_fch.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/soc/amd/cezanne/early_fch.c b/src/soc/amd/cezanne/early_fch.c
index fdacb9f525..bddcbee418 100644
--- a/src/soc/amd/cezanne/early_fch.c
+++ b/src/soc/amd/cezanne/early_fch.c
@@ -35,9 +35,10 @@ static void reset_i2c_peripherals(void)
 /* Initialize port80h routing early if needed */
 void configure_port80_routing_early(void)
 {
-	mb_set_up_early_espi();
-	if (CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI))
+	if (CONFIG(SOC_AMD_COMMON_BLOCK_USE_ESPI)) {
+		mb_set_up_early_espi();
 		espi_setup();
+	}
 }
 
 /* Before console init */