diff --git a/src/mainboard/google/auron/romstage.c b/src/mainboard/google/auron/romstage.c
index aedc33d3ed..aea8e211fa 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 @@ void mainboard_romstage_entry(struct romstage_params *rp)
 	/* 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 f1af14d53c..b924976d06 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 @@ int variant_smbios_data(device_t dev, int *handle,
 
 	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 f1af14d53c..b924976d06 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 @@ int variant_smbios_data(device_t dev, int *handle,
 
 	return len;
 }
-
-void variant_romstage_entry(struct romstage_params *rp)
-{
-	/* N/A for boards other than SAMUS */
-}