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/mainboard/emulation/qemu-riscv/bootblock.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'src/mainboard/emulation') diff --git a/src/mainboard/emulation/qemu-riscv/bootblock.c b/src/mainboard/emulation/qemu-riscv/bootblock.c index 831b193a6e..7282a4e787 100644 --- a/src/mainboard/emulation/qemu-riscv/bootblock.c +++ b/src/mainboard/emulation/qemu-riscv/bootblock.c @@ -18,28 +18,18 @@ */ #include -#include #include -#include #include -#include +#include // the qemu part of all this is very, very non-hardware like. // so it gets its own bootblock. void main(void) { - void *entry; - if (IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) { console_init(); exception_init(); } - entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, CONFIG_CBFS_PREFIX"/romstage"); - if (! entry) { - printk(BIOS_EMERG, "AAAAAAAAAAAAAA no romstage!\n"); - while (1); - } - - stage_exit(entry); + run_romstage(); } -- cgit v1.2.3