7 files changed, 14 insertions, 42 deletions
diff --git a/src/mainboard/google/daisy/romstage.c b/src/mainboard/google/daisy/romstage.c
index 46c659383d..ebd07d7c5e 100644
--- a/src/mainboard/google/daisy/romstage.c
+++ b/src/mainboard/google/daisy/romstage.c
@@ -37,7 +37,7 @@
 #include <soc/samsung/exynos5250/trustzone.h>
 #include <soc/samsung/exynos5250/wakeup.h>
 #include <console/console.h>
-#include <arch/stages.h>
+#include <program_loading.h>
 
 #include <drivers/maxim/max77686/max77686.h>
 #include <device/i2c.h>
@@ -145,7 +145,6 @@ static struct mem_timings *setup_clock(void)
 void main(void)
 {
 	struct mem_timings *mem;
-	void *entry;
 	int is_resume = (get_wakeup_state() != IS_NOT_WAKEUP);
 
 	timestamp_init(timestamp_get());
@@ -182,9 +181,7 @@ void main(void)
 
 	cbmem_initialize_empty();
 
-	entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage");
-
 	timestamp_add_now(TS_END_ROMSTAGE);
 
-	stage_exit(entry);
+	run_ramstage();
 }
diff --git a/src/mainboard/google/nyan/romstage.c b/src/mainboard/google/nyan/romstage.c
index a71f68269b..914c925d5d 100644
--- a/src/mainboard/google/nyan/romstage.c
+++ b/src/mainboard/google/nyan/romstage.c
@@ -21,11 +21,11 @@
 #include <arch/cpu.h>
 #include <arch/exception.h>
 #include <arch/io.h>
-#include <arch/stages.h>
 #include <cbfs.h>
 #include <cbmem.h>
 #include <console/console.h>
 #include <mainboard/google/nyan/reset.h>
+#include <program_loading.h>
 #include <romstage_handoff.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include "sdram_configs.h"
@@ -201,12 +201,7 @@ static void __attribute__((noinline)) romstage(void)
 
 	vboot_verify_firmware(romstage_handoff_find_or_add());
 
-	timestamp_add_now(TS_START_COPYRAM);
-	void *entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA,
-				      "fallback/coreboot_ram");
-	timestamp_add_now(TS_END_COPYRAM);
-
-	stage_exit(entry);
+	run_ramstage();
 }
 
 /* Stub to force arm_init_caches to the top, before any stack/memory accesses */
diff --git a/src/mainboard/google/nyan_big/romstage.c b/src/mainboard/google/nyan_big/romstage.c
index a71f68269b..914c925d5d 100644
--- a/src/mainboard/google/nyan_big/romstage.c
+++ b/src/mainboard/google/nyan_big/romstage.c
@@ -21,11 +21,11 @@
 #include <arch/cpu.h>
 #include <arch/exception.h>
 #include <arch/io.h>
-#include <arch/stages.h>
 #include <cbfs.h>
 #include <cbmem.h>
 #include <console/console.h>
 #include <mainboard/google/nyan/reset.h>
+#include <program_loading.h>
 #include <romstage_handoff.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include "sdram_configs.h"
@@ -201,12 +201,7 @@ static void __attribute__((noinline)) romstage(void)
 
 	vboot_verify_firmware(romstage_handoff_find_or_add());
 
-	timestamp_add_now(TS_START_COPYRAM);
-	void *entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA,
-				      "fallback/coreboot_ram");
-	timestamp_add_now(TS_END_COPYRAM);
-
-	stage_exit(entry);
+	run_ramstage();
 }
 
 /* Stub to force arm_init_caches to the top, before any stack/memory accesses */
diff --git a/src/mainboard/google/nyan_blaze/romstage.c b/src/mainboard/google/nyan_blaze/romstage.c
index 522ee91043..1d7d77d42f 100644
--- a/src/mainboard/google/nyan_blaze/romstage.c
+++ b/src/mainboard/google/nyan_blaze/romstage.c
@@ -21,11 +21,11 @@
 #include <arch/cpu.h>
 #include <arch/exception.h>
 #include <arch/io.h>
-#include <arch/stages.h>
 #include <cbfs.h>
 #include <cbmem.h>
 #include <console/console.h>
 #include <mainboard/google/nyan/reset.h>
+#include <program_loading.h>
 #include <romstage_handoff.h>
 #include <vendorcode/google/chromeos/chromeos.h>
 #include "sdram_configs.h"
@@ -205,12 +205,7 @@ static void __attribute__((noinline)) romstage(void)
 	vboot_verify_firmware(romstage_handoff_find_or_add());
 #endif
 
-	timestamp_add_now(TS_START_COPYRAM);
-	void *entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA,
-				      "fallback/coreboot_ram");
-	timestamp_add_now(TS_END_COPYRAM);
-
-	stage_exit(entry);
+	run_ramstage();
 }
 
 /* Stub to force arm_init_caches to the top, before any stack/memory accesses */
diff --git a/src/mainboard/google/peach_pit/romstage.c b/src/mainboard/google/peach_pit/romstage.c
index ce4e399626..04be804b05 100644
--- a/src/mainboard/google/peach_pit/romstage.c
+++ b/src/mainboard/google/peach_pit/romstage.c
@@ -38,7 +38,7 @@
 #include <soc/samsung/exynos5420/trustzone.h>
 #include <soc/samsung/exynos5420/wakeup.h>
 #include <console/console.h>
-#include <arch/stages.h>
+#include <program_loading.h>
 
 #include <drivers/maxim/max77802/max77802.h>
 #include <device/i2c.h>
@@ -228,7 +228,6 @@ void main(void)
 {
 
 	extern struct mem_timings mem_timings;
-	void *entry;
 	int is_resume = (get_wakeup_state() != IS_NOT_WAKEUP);
 	int power_init_failed;
 
@@ -278,10 +277,9 @@ void main(void)
 
 	cbmem_initialize_empty();
 
-	entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage");
 	simple_spi_test();
 
 	timestamp_add_now(TS_END_ROMSTAGE);
 
-	stage_exit(entry);
+	run_ramstage();
 }
diff --git a/src/mainboard/google/storm/romstage.c b/src/mainboard/google/storm/romstage.c
index 99cc90bea9..fb5b42e869 100644
--- a/src/mainboard/google/storm/romstage.c
+++ b/src/mainboard/google/storm/romstage.c
@@ -17,18 +17,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <arch/stages.h>
-#include <cbfs.h>
 #include <cbmem.h>
 #include <console/console.h>
+#include <program_loading.h>
 
 void main(void)
 {
-	void *entry;
-
 	console_init();
 	cbmem_initialize_empty();
-
-	entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/coreboot_ram");
-	stage_exit(entry);
+	run_ramstage();
 }
diff --git a/src/mainboard/google/veyron/romstage.c b/src/mainboard/google/veyron/romstage.c
index b9daefe6b9..5b26f48e3c 100644
--- a/src/mainboard/google/veyron/romstage.c
+++ b/src/mainboard/google/veyron/romstage.c
@@ -21,17 +21,15 @@
 #include <armv7.h>
 #include <cbfs.h>
 #include <console/console.h>
-#include <arch/stages.h>
 #include <cbmem.h>
 #include <delay.h>
+#include <program_loading.h>
 #include <timestamp.h>
 #include <arch/cache.h>
 #include <arch/exception.h>
 
 void main(void)
 {
-	void *entry;
-
 	console_init();
 
 	/* used for MMU and CBMEM setup, in MB */
@@ -54,6 +52,5 @@ void main(void)
 
 	cbmem_initialize_empty();
 
-	entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/ramstage");
-	stage_exit(entry);
+	run_ramstage();
 }