summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2021-01-20 22:48:50 +0100
committerAngel Pons <th3fanbus@gmail.com>2021-01-24 12:06:55 +0000
commit65f81a7b9024290b9b92bda6d1d67ab805fa3986 (patch)
tree8c3308f799a6f155ea62130ec1c867bca8b5e982 /src/soc
parentac1c9bb5cdca24312c669eaaa908b13202e3bb35 (diff)
broadwell: Flatten `mainboard_pre_raminit`
All Broadwell boards only use the `mainboard_pre_raminit` function to call `mainboard_fill_pei_data` and optionally `mainboard_fill_spd_data`. Move the declaration and weak definition of `mainboard_fill_spd_data` to platform code, replace the call to `mainboard_pre_raminit` in romstage.c with calls to `mainboard_fill_pei_data` and `mainboard_fill_spd_data`, and delete all other instances of `mainboard_pre_raminit` for Broadwell. Finally, delete now-empty romstage.c and spd.h files from mainboards. Change-Id: I3334b20bd7138bb753b996a137ff106e87c6e8a5 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/49776 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/broadwell/include/soc/romstage.h2
-rw-r--r--src/soc/intel/broadwell/romstage.c9
2 files changed, 8 insertions, 3 deletions
diff --git a/src/soc/intel/broadwell/include/soc/romstage.h b/src/soc/intel/broadwell/include/soc/romstage.h
index eb51ea151e..9f4eef2316 100644
--- a/src/soc/intel/broadwell/include/soc/romstage.h
+++ b/src/soc/intel/broadwell/include/soc/romstage.h
@@ -11,7 +11,7 @@ struct romstage_params {
struct pei_data pei_data;
};
-void mainboard_pre_raminit(struct romstage_params *params);
+void mainboard_fill_spd_data(struct pei_data *pei_data);
void mainboard_post_raminit(const int s3resume);
void raminit(struct pei_data *pei_data);
diff --git a/src/soc/intel/broadwell/romstage.c b/src/soc/intel/broadwell/romstage.c
index 084c3e6e99..76e1d7e47b 100644
--- a/src/soc/intel/broadwell/romstage.c
+++ b/src/soc/intel/broadwell/romstage.c
@@ -9,11 +9,16 @@
#include <soc/gpio.h>
#include <soc/me.h>
#include <soc/pei_data.h>
+#include <soc/pei_wrapper.h>
#include <soc/pm.h>
#include <soc/romstage.h>
#include <stdint.h>
#include <timestamp.h>
+__weak void mainboard_fill_spd_data(struct pei_data *pei_data)
+{
+}
+
__weak void mainboard_post_raminit(const int s3resume)
{
}
@@ -45,8 +50,8 @@ void mainboard_romstage_entry(void)
/* Initialize GPIOs */
init_gpios(mainboard_gpio_config);
- /* Fill in mainboard pei_date. */
- mainboard_pre_raminit(&rp);
+ mainboard_fill_pei_data(&rp.pei_data);
+ mainboard_fill_spd_data(&rp.pei_data);
post_code(0x32);