From 97e9e5622df8b2386b2828da2671018232056035 Mon Sep 17 00:00:00 2001
From: Arthur Heymans <arthur@aheymans.xyz>
Date: Sun, 12 May 2019 13:47:35 +0200
Subject: soc/intel/broadwell: Clean up the bootflow

Call the raminit from a common location instead of from the mainboard
specific code.

Change-Id: I65d522237a0bb7b2c032536ede10e2cf93c134d8
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32760
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/google/auron/romstage.c      |  9 ++++-----
 src/mainboard/google/jecht/romstage.c      | 10 ++++------
 src/mainboard/intel/wtm2/romstage.c        |  8 ++++----
 src/mainboard/purism/librem_bdw/romstage.c |  7 ++++---
 4 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'src/mainboard')

diff --git a/src/mainboard/google/auron/romstage.c b/src/mainboard/google/auron/romstage.c
index 497489911e..568c4c819c 100644
--- a/src/mainboard/google/auron/romstage.c
+++ b/src/mainboard/google/auron/romstage.c
@@ -27,17 +27,16 @@ __weak void variant_romstage_entry(struct romstage_params *rp)
 {
 }
 
-void mainboard_romstage_entry(struct romstage_params *rp)
+void mainboard_pre_raminit(struct romstage_params *rp)
 {
-	post_code(0x32);
-
 	/* Fill out PEI DATA */
 	mainboard_fill_pei_data(&rp->pei_data);
 	mainboard_fill_spd_data(&rp->pei_data);
 
-	/* Call into the real romstage main with this board's attributes. */
-	romstage_common(rp);
+}
 
+void mainboard_post_raminit(struct romstage_params *rp)
+{
 	/* Do variant-specific init */
 	variant_romstage_entry(rp);
 }
diff --git a/src/mainboard/google/jecht/romstage.c b/src/mainboard/google/jecht/romstage.c
index 8d1ae8aca2..86888c82f8 100644
--- a/src/mainboard/google/jecht/romstage.c
+++ b/src/mainboard/google/jecht/romstage.c
@@ -27,17 +27,15 @@
 #include "onboard.h"
 
 
-void mainboard_romstage_entry(struct romstage_params *rp)
+void mainboard_pre_raminit(struct romstage_params *rp)
 {
-	post_code(0x32);
-
 	/* Fill out PEI DATA */
 	mainboard_fill_pei_data(&rp->pei_data);
 	mainboard_fill_spd_data(&rp->pei_data);
+}
 
-	/* Call into the real romstage main with this board's attributes. */
-	romstage_common(rp);
-
+void mainboard_post_raminit(struct romstage_params *rp)
+{
 	if (CONFIG(CHROMEOS))
 		init_bootmode_straps();
 }
diff --git a/src/mainboard/intel/wtm2/romstage.c b/src/mainboard/intel/wtm2/romstage.c
index 5b8df275d8..f4e336694d 100644
--- a/src/mainboard/intel/wtm2/romstage.c
+++ b/src/mainboard/intel/wtm2/romstage.c
@@ -22,12 +22,12 @@
 #include <soc/pei_wrapper.h>
 #include <soc/romstage.h>
 
-void mainboard_romstage_entry(struct romstage_params *rp)
+void mainboard_pre_raminit(struct romstage_params *rp)
 {
-	post_code(0x32);
-
 	/* Fill out PEI DATA */
 	mainboard_fill_pei_data(&rp->pei_data);
+}
 
-	romstage_common(rp);
+void mainboard_post_raminit(struct romstage_params *rp)
+{
 }
diff --git a/src/mainboard/purism/librem_bdw/romstage.c b/src/mainboard/purism/librem_bdw/romstage.c
index 5330d191b4..0e1ad885b0 100644
--- a/src/mainboard/purism/librem_bdw/romstage.c
+++ b/src/mainboard/purism/librem_bdw/romstage.c
@@ -18,11 +18,12 @@
 #include <soc/pei_wrapper.h>
 #include <soc/romstage.h>
 
-void mainboard_romstage_entry(struct romstage_params *rp)
+void mainboard_pre_raminit(struct romstage_params *rp)
 {
 	/* Fill out PEI DATA */
 	mainboard_fill_pei_data(&rp->pei_data);
+}
 
-	/* Initialize memory */
-	romstage_common(rp);
+void mainboard_post_raminit(struct romstage_params *rp)
+{
 }
-- 
cgit v1.2.3