bootblocks: use run_romstage()

Instead of sprinkling the cbfs calls around (as well as getting
return values incorrect) use the common run_romstage() to perform
the necessary work to load and run romstage.

Change-Id: Id59f47febf5122cb3ee60f9741cfb58cb60ccab5
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/8711
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

1 files changed, 2 insertions, 8 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();
 }