From f5d7f605aba97451f3116cf6489c0e31b5554427 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 17 Mar 2015 13:20:02 -0500 Subject: 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 Reviewed-on: http://review.coreboot.org/8711 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/arch/arm64/armv8/bootblock_simple.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/arch/arm64/armv8') diff --git a/src/arch/arm64/armv8/bootblock_simple.c b/src/arch/arm64/armv8/bootblock_simple.c index 7948f2f717..ce64a4cd63 100644 --- a/src/arch/arm64/armv8/bootblock_simple.c +++ b/src/arch/arm64/armv8/bootblock_simple.c @@ -25,7 +25,7 @@ #include #include #include -#include +#include static int boot_cpu(void) { @@ -39,9 +39,6 @@ static int boot_cpu(void) void main(void) { - const char *stage_name = CONFIG_CBFS_PREFIX"/romstage"; - void *entry = NULL; - /* Globally disable MMU, caches, and branch prediction (these should * be disabled by default on reset) */ dcache_mmu_disable(); @@ -64,10 +61,5 @@ void main(void) exception_init(); #endif - entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, stage_name); - - printk(BIOS_SPEW, "stage_name %s, entry %p\n", stage_name, entry); - - if (entry) stage_exit(entry); - halt(); + run_romstage(); } -- cgit v1.2.3