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>
This commit is contained in:
Aaron Durbin
2015-03-17 13:20:02 -05:00
committed by Aaron Durbin
parent e4f3e7a9c6
commit f5d7f605ab
6 changed files with 12 additions and 62 deletions

View File

@@ -26,6 +26,7 @@
#include <arch/exception.h>
#include <cbfs.h>
#include <console/console.h>
#include <program_loading.h>
static int boot_cpu(void)
{
@@ -39,9 +40,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 +62,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);
hlt();
run_romstage();
}