From 4778590d159a13409e413556d32cbfea39ba207a Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
Date: Fri, 19 Feb 2021 23:23:19 +0100
Subject: soc/intel/skylake: Move `gspi_early_bar_init()` call
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For consistency with newer platforms, do this in pch.c instead.

Change-Id: Ie7a1d3e106553388df55044be91c7837061c42da
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50954
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
---
 src/soc/intel/skylake/bootblock/bootblock.c | 2 --
 src/soc/intel/skylake/bootblock/pch.c       | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/soc/intel/skylake/bootblock/bootblock.c b/src/soc/intel/skylake/bootblock/bootblock.c
index 7b8b147aaa..276bb48b95 100644
--- a/src/soc/intel/skylake/bootblock/bootblock.c
+++ b/src/soc/intel/skylake/bootblock/bootblock.c
@@ -2,7 +2,6 @@
 
 #include <bootblock_common.h>
 #include <intelblocks/fast_spi.h>
-#include <intelblocks/gspi.h>
 #include <intelblocks/systemagent.h>
 #include <intelblocks/tco.h>
 #include <intelblocks/uart.h>
@@ -34,7 +33,6 @@ void bootblock_soc_init(void)
 	 */
 	report_platform_info();
 	bootblock_pch_init();
-	gspi_early_bar_init();
 
 	/* Program TCO_BASE_ADDRESS and TCO Timer Halt */
 	tco_configure();
diff --git a/src/soc/intel/skylake/bootblock/pch.c b/src/soc/intel/skylake/bootblock/pch.c
index b15bf98fa1..1685e43e0e 100644
--- a/src/soc/intel/skylake/bootblock/pch.c
+++ b/src/soc/intel/skylake/bootblock/pch.c
@@ -5,6 +5,7 @@
 #include <intelblocks/cse.h>
 #include <intelblocks/dmi.h>
 #include <intelblocks/fast_spi.h>
+#include <intelblocks/gspi.h>
 #include <intelblocks/itss.h>
 #include <intelblocks/lpc_lib.h>
 #include <intelblocks/p2sb.h>
@@ -142,4 +143,6 @@ void bootblock_pch_init(void)
 
 	/* initialize Heci interface */
 	heci_init(HECI1_BASE_ADDRESS);
+
+	gspi_early_bar_init();
 }
-- 
cgit v1.2.3