diff --git a/src/soc/intel/baytrail/romstage/romstage.c b/src/soc/intel/baytrail/romstage/romstage.c
index e90d8aaf75..78174cc944 100644
--- a/src/soc/intel/baytrail/romstage/romstage.c
+++ b/src/soc/intel/baytrail/romstage/romstage.c
@@ -93,17 +93,6 @@ void * asmlinkage romstage_main(unsigned long bist,
 	/* Save romstage begin */
 	mark_ts(&rp, timestamp_get());
 
-	/* Call into mainboard. */
-	mainboard_romstage_entry(&rp);
-
-	return setup_stack_and_mttrs();
-}
-
-/* Entry from the mainboard. */
-void romstage_common(struct romstage_params *params)
-{
-	struct romstage_handoff *handoff;
-
 	program_base_addresses();
 
 	tco_disable();
@@ -118,6 +107,17 @@ void romstage_common(struct romstage_params *params)
 
 	gfx_init();
 
+	/* Call into mainboard. */
+	mainboard_romstage_entry(&rp);
+
+	return setup_stack_and_mttrs();
+}
+
+/* Entry from the mainboard. */
+void romstage_common(struct romstage_params *params)
+{
+	struct romstage_handoff *handoff;
+
 	mark_ts(params, timestamp_get());
 
 	/* Initialize RAM */