[coreboot-gerrit] Change in coreboot[master]: google/auron: Clean up variant-specific romstage code

[Matt DeVillier (Code Review)]

Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/28612


Change subject: google/auron: Clean up variant-specific romstage code
......................................................................

google/auron: Clean up variant-specific romstage code

Use an empty weak function for variant_romstage_entry(), rather than
having separate empty functions for boards which don't utilize it.

Change-Id: I7a278ed716484bea377a5dd98d4a534502c8bab6
Signed-off-by: Matt DeVillier <matt.devillier at gmail.com>
---
M src/mainboard/google/auron/romstage.c
M src/mainboard/google/auron/variants/auron_paine/variant.c
M src/mainboard/google/auron/variants/auron_yuna/variant.c
3 files changed, 5 insertions(+), 13 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/12/28612/1

diff --git a/src/mainboard/google/auron/romstage.c b/src/mainboard/google/auron/romstage.c
index aedc33d..aea8e21 100644
--- a/src/mainboard/google/auron/romstage.c
+++ b/src/mainboard/google/auron/romstage.c
@@ -25,6 +25,10 @@
 #include <variant/spd.h>
 #include "variant.h"
 
+__weak void variant_romstage_entry(struct romstage_params *rp)
+{
+}
+
 void mainboard_romstage_entry(struct romstage_params *rp)
 {
 	struct pei_data pei_data;
@@ -43,6 +47,6 @@
 	/* Call into the real romstage main with this board's attributes. */
 	romstage_common(rp);
 
-	/* Do variant-specific (read: Samus) init */
+	/* Do variant-specific init */
 	variant_romstage_entry(rp);
 }
diff --git a/src/mainboard/google/auron/variants/auron_paine/variant.c b/src/mainboard/google/auron/variants/auron_paine/variant.c
index f1af14d..b924976 100644
--- a/src/mainboard/google/auron/variants/auron_paine/variant.c
+++ b/src/mainboard/google/auron/variants/auron_paine/variant.c
@@ -12,7 +12,6 @@
  */
 
 #include <smbios.h>
-#include <soc/romstage.h>
 #include <variant/onboard.h>
 #include <mainboard/google/auron/variant.h>
 
@@ -32,8 +31,3 @@
 
 	return len;
 }
-
-void variant_romstage_entry(struct romstage_params *rp)
-{
-	/* N/A for boards other than SAMUS */
-}
diff --git a/src/mainboard/google/auron/variants/auron_yuna/variant.c b/src/mainboard/google/auron/variants/auron_yuna/variant.c
index f1af14d..b924976 100644
--- a/src/mainboard/google/auron/variants/auron_yuna/variant.c
+++ b/src/mainboard/google/auron/variants/auron_yuna/variant.c
@@ -12,7 +12,6 @@
  */
 
 #include <smbios.h>
-#include <soc/romstage.h>
 #include <variant/onboard.h>
 #include <mainboard/google/auron/variant.h>
 
@@ -32,8 +31,3 @@
 
 	return len;
 }
-
-void variant_romstage_entry(struct romstage_params *rp)
-{
-	/* N/A for boards other than SAMUS */
-}

-- 
To view, visit https://review.coreboot.org/28612
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a278ed716484bea377a5dd98d4a534502c8bab6
Gerrit-Change-Number: 28612
Gerrit-PatchSet: 1
Gerrit-Owner: Matt DeVillier <matt.devillier at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180915/3d43cf73/attachment-0001.html>