From 8b08c69386d280842da44df65df5f103a53d23d6 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Fri, 24 Apr 2020 17:11:25 +0200
Subject: [PATCH] {icelake,jasperlake,skylake,tigerlake}/bootblock.c: Clean up
 includes

Drop unused includes and add missing <intelblocks/systemagent.h>.

Change-Id: I06c8b2bf65283c3c1fcd25fdaae298b82fc0e09c
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/40689
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Wonkyu Kim <wonkyu.kim@intel.com>
---
 src/soc/intel/icelake/bootblock/bootblock.c    | 3 ---
 src/soc/intel/jasperlake/bootblock/bootblock.c | 3 ---
 src/soc/intel/skylake/bootblock/bootblock.c    | 2 +-
 src/soc/intel/tigerlake/bootblock/bootblock.c  | 3 ---
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/soc/intel/icelake/bootblock/bootblock.c b/src/soc/intel/icelake/bootblock/bootblock.c
index ce71cdde89..54ad85a82e 100644
--- a/src/soc/intel/icelake/bootblock/bootblock.c
+++ b/src/soc/intel/icelake/bootblock/bootblock.c
@@ -1,12 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootblock_common.h>
-#include <intelblocks/gspi.h>
 #include <intelblocks/systemagent.h>
 #include <intelblocks/uart.h>
 #include <soc/bootblock.h>
-#include <soc/iomap.h>
-#include <soc/pch.h>
 
 asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
 {
diff --git a/src/soc/intel/jasperlake/bootblock/bootblock.c b/src/soc/intel/jasperlake/bootblock/bootblock.c
index ce71cdde89..54ad85a82e 100644
--- a/src/soc/intel/jasperlake/bootblock/bootblock.c
+++ b/src/soc/intel/jasperlake/bootblock/bootblock.c
@@ -1,12 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootblock_common.h>
-#include <intelblocks/gspi.h>
 #include <intelblocks/systemagent.h>
 #include <intelblocks/uart.h>
 #include <soc/bootblock.h>
-#include <soc/iomap.h>
-#include <soc/pch.h>
 
 asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
 {
diff --git a/src/soc/intel/skylake/bootblock/bootblock.c b/src/soc/intel/skylake/bootblock/bootblock.c
index 461e28cbc5..6380db2e1f 100644
--- a/src/soc/intel/skylake/bootblock/bootblock.c
+++ b/src/soc/intel/skylake/bootblock/bootblock.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootblock_common.h>
-#include <drivers/i2c/designware/dw_i2c.h>
+#include <intelblocks/systemagent.h>
 #include <intelblocks/gspi.h>
 #include <intelblocks/uart.h>
 #include <soc/bootblock.h>
diff --git a/src/soc/intel/tigerlake/bootblock/bootblock.c b/src/soc/intel/tigerlake/bootblock/bootblock.c
index ce71cdde89..54ad85a82e 100644
--- a/src/soc/intel/tigerlake/bootblock/bootblock.c
+++ b/src/soc/intel/tigerlake/bootblock/bootblock.c
@@ -1,12 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <bootblock_common.h>
-#include <intelblocks/gspi.h>
 #include <intelblocks/systemagent.h>
 #include <intelblocks/uart.h>
 #include <soc/bootblock.h>
-#include <soc/iomap.h>
-#include <soc/pch.h>
 
 asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
 {