From de640781020b10e72dd6a5cda26cab10932e94fe Mon Sep 17 00:00:00 2001
From: Kyösti Mälkki <kyosti.malkki@gmail.com>
Date: Tue, 3 Dec 2019 07:30:26 +0200
Subject: bootblock: Provide some common prototypes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The split of bootblock initialisation to cpu, northbridge and
southbridge is not specific to intel at all, create new header
<arch/bootblock.h> as AMD will want some of these too.

Change-Id: I702cc6bad4afee4f61acf58b9155608b28eb417e
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37429
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
---
 src/soc/intel/broadwell/bootblock/cpu.c         | 4 ++--
 src/soc/intel/broadwell/bootblock/pch.c         | 2 +-
 src/soc/intel/broadwell/bootblock/systemagent.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/soc/intel/broadwell')

diff --git a/src/soc/intel/broadwell/bootblock/cpu.c b/src/soc/intel/broadwell/bootblock/cpu.c
index f3c35f3441..4c6ab75ef9 100644
--- a/src/soc/intel/broadwell/bootblock/cpu.c
+++ b/src/soc/intel/broadwell/bootblock/cpu.c
@@ -14,15 +14,15 @@
  */
 
 #include <stdint.h>
+#include <arch/bootblock.h>
+#include <arch/io.h>
 #include <cpu/x86/cache.h>
 #include <cpu/x86/msr.h>
 #include <cpu/x86/mtrr.h>
-#include <arch/io.h>
 #include <halt.h>
 #include <soc/rcba.h>
 #include <soc/msr.h>
 #include <delay.h>
-#include <cpu/intel/car/bootblock.h>
 
 static void set_flex_ratio_to_tdp_nominal(void)
 {
diff --git a/src/soc/intel/broadwell/bootblock/pch.c b/src/soc/intel/broadwell/bootblock/pch.c
index 590961b361..7ea4a58e1f 100644
--- a/src/soc/intel/broadwell/bootblock/pch.c
+++ b/src/soc/intel/broadwell/bootblock/pch.c
@@ -13,6 +13,7 @@
  * GNU General Public License for more details.
  */
 
+#include <arch/bootblock.h>
 #include <device/pci_ops.h>
 #include <soc/iomap.h>
 #include <soc/lpc.h>
@@ -22,7 +23,6 @@
 #include <reg_script.h>
 #include <soc/pm.h>
 #include <soc/romstage.h>
-#include <cpu/intel/car/bootblock.h>
 
 /*
  * Enable Prefetching and Caching.
diff --git a/src/soc/intel/broadwell/bootblock/systemagent.c b/src/soc/intel/broadwell/bootblock/systemagent.c
index 7aaed789ac..c9c7d95ca6 100644
--- a/src/soc/intel/broadwell/bootblock/systemagent.c
+++ b/src/soc/intel/broadwell/bootblock/systemagent.c
@@ -13,10 +13,10 @@
  * GNU General Public License for more details.
  */
 
+#include <arch/bootblock.h>
 #include <device/pci_ops.h>
 #include <soc/pci_devs.h>
 #include <soc/systemagent.h>
-#include <cpu/intel/car/bootblock.h>
 
 void bootblock_early_northbridge_init(void)
 {
-- 
cgit v1.2.3