aboutsummaryrefslogtreecommitdiffstats
path: root/src/arch/riscv
diff options
context:
space:
mode:
authorAaron Durbin <adurbin@chromium.org>2015-03-17 13:20:02 -0500
committerAaron Durbin <adurbin@google.com>2015-03-20 19:28:52 +0100
commitf5d7f605aba97451f3116cf6489c0e31b5554427 (patch)
tree760c54276be0be592ef0456ccd874ed179402322 /src/arch/riscv
parente4f3e7a9c656356a92e827d5a39b85106cbdaf3a (diff)
downloadcoreboot-f5d7f605aba97451f3116cf6489c0e31b5554427.tar.gz
coreboot-f5d7f605aba97451f3116cf6489c0e31b5554427.tar.xz
coreboot-f5d7f605aba97451f3116cf6489c0e31b5554427.zip
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>
Diffstat (limited to 'src/arch/riscv')
-rw-r--r--src/arch/riscv/bootblock_simple.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/arch/riscv/bootblock_simple.c b/src/arch/riscv/bootblock_simple.c
index d8339d1f7..6cde4ec93 100644
--- a/src/arch/riscv/bootblock_simple.c
+++ b/src/arch/riscv/bootblock_simple.c
@@ -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();
}