From 2bc7a6b3d2c68fd820a9390efedc44a3d632ab26 Mon Sep 17 00:00:00 2001
From: Angel Pons <th3fanbus@gmail.com>
Date: Wed, 23 Jun 2021 14:26:45 +0200
Subject: [PATCH] soc/intel/broadwell: Move `mainboard_fill_spd_data`

Move the `mainboard_fill_spd_data` function out of romstage, in
preparation to confine `pei_data` usage to as few files as possible.

Change-Id: I6447da4d135d920f9145e817bfb7f9056e09df84
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55805
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/google/auron/spd.c                    | 2 +-
 src/mainboard/google/auron/variants/buddy/spd/spd.c | 1 +
 src/mainboard/google/jecht/spd/spd.c                | 2 +-
 src/soc/intel/broadwell/include/soc/pei_wrapper.h   | 1 +
 src/soc/intel/broadwell/include/soc/romstage.h      | 3 ---
 src/soc/intel/broadwell/raminit.c                   | 4 ++++
 src/soc/intel/broadwell/romstage.c                  | 4 ----
 7 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/mainboard/google/auron/spd.c b/src/mainboard/google/auron/spd.c
index 52e4d63915..49ee42c5e1 100644
--- a/src/mainboard/google/auron/spd.c
+++ b/src/mainboard/google/auron/spd.c
@@ -5,7 +5,7 @@
 #include <mainboard/google/auron/variant.h>
 #include <southbridge/intel/lynxpoint/lp_gpio.h>
 #include <soc/pei_data.h>
-#include <soc/romstage.h>
+#include <soc/pei_wrapper.h>
 #include <string.h>
 #include <types.h>
 
diff --git a/src/mainboard/google/auron/variants/buddy/spd/spd.c b/src/mainboard/google/auron/variants/buddy/spd/spd.c
index 200d909538..6fb439b96c 100644
--- a/src/mainboard/google/auron/variants/buddy/spd/spd.c
+++ b/src/mainboard/google/auron/variants/buddy/spd/spd.c
@@ -2,6 +2,7 @@
 
 #include <mainboard/google/auron/variant.h>
 #include <soc/pei_data.h>
+#include <soc/pei_wrapper.h>
 
 /* Copy SPD data for on-board memory */
 void mainboard_fill_spd_data(struct pei_data *pei_data)
diff --git a/src/mainboard/google/jecht/spd/spd.c b/src/mainboard/google/jecht/spd/spd.c
index 102ba4933e..942b9a33e9 100644
--- a/src/mainboard/google/jecht/spd/spd.c
+++ b/src/mainboard/google/jecht/spd/spd.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 
 #include <soc/pei_data.h>
-#include <soc/romstage.h>
+#include <soc/pei_wrapper.h>
 
 /* Copy SPD data for on-board memory */
 void mainboard_fill_spd_data(struct pei_data *pei_data)
diff --git a/src/soc/intel/broadwell/include/soc/pei_wrapper.h b/src/soc/intel/broadwell/include/soc/pei_wrapper.h
index 81e1bd50fb..4a38a2afa6 100644
--- a/src/soc/intel/broadwell/include/soc/pei_wrapper.h
+++ b/src/soc/intel/broadwell/include/soc/pei_wrapper.h
@@ -28,5 +28,6 @@ static inline void pei_data_usb3_port(struct pei_data *pei_data, int port,
 
 void broadwell_fill_pei_data(struct pei_data *pei_data);
 void mainboard_fill_pei_data(struct pei_data *pei_data);
+void mainboard_fill_spd_data(struct pei_data *pei_data);
 
 #endif
diff --git a/src/soc/intel/broadwell/include/soc/romstage.h b/src/soc/intel/broadwell/include/soc/romstage.h
index 95af4d98a2..d878e7a9c2 100644
--- a/src/soc/intel/broadwell/include/soc/romstage.h
+++ b/src/soc/intel/broadwell/include/soc/romstage.h
@@ -3,9 +3,6 @@
 #ifndef _BROADWELL_ROMSTAGE_H_
 #define _BROADWELL_ROMSTAGE_H_
 
-#include <soc/pei_data.h>
-
-void mainboard_fill_spd_data(struct pei_data *pei_data);
 void mainboard_post_raminit(const int s3resume);
 
 struct chipset_power_state;
diff --git a/src/soc/intel/broadwell/raminit.c b/src/soc/intel/broadwell/raminit.c
index 28b3f37ed9..6254071ac8 100644
--- a/src/soc/intel/broadwell/raminit.c
+++ b/src/soc/intel/broadwell/raminit.c
@@ -177,6 +177,10 @@ static void setup_sdram_meminfo(struct pei_data *pei_data)
 	}
 }
 
+__weak void mainboard_fill_spd_data(struct pei_data *pei_data)
+{
+}
+
 void perform_raminit(const struct chipset_power_state *const power_state)
 {
 	const int s3resume = power_state->prev_sleep_state == ACPI_S3;
diff --git a/src/soc/intel/broadwell/romstage.c b/src/soc/intel/broadwell/romstage.c
index af8d30fb09..09a7283c14 100644
--- a/src/soc/intel/broadwell/romstage.c
+++ b/src/soc/intel/broadwell/romstage.c
@@ -14,10 +14,6 @@
 #include <southbridge/intel/lynxpoint/lp_gpio.h>
 #include <stdint.h>
 
-__weak void mainboard_fill_spd_data(struct pei_data *pei_data)
-{
-}
-
 __weak void mainboard_post_raminit(const int s3resume)
 {
 }