2 files changed, 4 insertions, 16 deletions
diff --git a/src/arch/arm/armv4/bootblock_simple.c b/src/arch/arm/armv4/bootblock_simple.c
index 15b6bdec9a..9e399a9b7c 100644
--- a/src/arch/arm/armv4/bootblock_simple.c
+++ b/src/arch/arm/armv4/bootblock_simple.c
@@ -24,16 +24,13 @@
 #include <bootblock_common.h>
 #include <cbfs.h>
 #include <console/console.h>
-#include <halt.h>
+#include <program_loading.h>
 
 __attribute__((weak)) void bootblock_soc_init(void) { /* do nothing */ }
 __attribute__((weak)) void bootblock_mainboard_init(void) { /* do nothing */ }
 
 void main(void)
 {
-	const char *stage_name = "fallback/romstage";
-	void *entry;
-
 	bootblock_soc_init();
 	bootblock_mainboard_init();
 
@@ -42,8 +39,5 @@ void main(void)
 		exception_init();
 	}
 
-	entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, stage_name);
-
-	if (entry) stage_exit(entry);
-	halt();
+	run_romstage();
 }
diff --git a/src/arch/arm/armv7/bootblock_simple.c b/src/arch/arm/armv7/bootblock_simple.c
index 2fc000d746..96f2445f57 100644
--- a/src/arch/arm/armv7/bootblock_simple.c
+++ b/src/arch/arm/armv7/bootblock_simple.c
@@ -25,7 +25,7 @@
 #include <bootblock_common.h>
 #include <cbfs.h>
 #include <console/console.h>
-#include <halt.h>
+#include <program_loading.h>
 #include <smp/node.h>
 
 __attribute__((weak)) void bootblock_soc_init(void) { /* do nothing */ }
@@ -33,9 +33,6 @@ __attribute__((weak)) void bootblock_mainboard_init(void) { /* do nothing */ }
 
 void main(void)
 {
-	const char *stage_name = "fallback/romstage";
-	void *entry;
-
 	bootblock_soc_init();
 	bootblock_mainboard_init();
 
@@ -44,8 +41,5 @@ void main(void)
 	exception_init();
 #endif
 
-	entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, stage_name);
-
-	if (entry) stage_exit(entry);
-	halt();
+	run_romstage();
 }