1 files changed, 10 insertions, 3 deletions
diff --git a/src/mainboard/google/veyron_rialto/romstage.c b/src/mainboard/google/veyron_rialto/romstage.c
index db2e343280..488f581a76 100644
--- a/src/mainboard/google/veyron_rialto/romstage.c
+++ b/src/mainboard/google/veyron_rialto/romstage.c
@@ -2,17 +2,18 @@
 
 #include <arch/cache.h>
 #include <arch/exception.h>
-#include <device/mmio.h>
 #include <armv7.h>
 #include <assert.h>
 #include <cbmem.h>
 #include <console/console.h>
+#include <device/mmio.h>
 #include <program_loading.h>
-#include <soc/sdram.h>
+#include <romstage_common.h>
 #include <soc/clock.h>
-#include <soc/pwm.h>
 #include <soc/grf.h>
+#include <soc/pwm.h>
 #include <soc/rk808.h>
+#include <soc/sdram.h>
 #include <soc/tsadc.h>
 #include <symbols.h>
 #include <timestamp.h>
@@ -68,6 +69,12 @@ void main(void)
 
 	console_init();
 	exception_init();
+
+	romstage_main();
+}
+
+void __noreturn romstage_main(void)
+{
 	configure_l2ctlr();
 	tsadc_init();