diff options
author | Aaron Durbin <adurbin@chromium.org> | 2015-03-17 13:20:02 -0500 |
---|---|---|
committer | Aaron Durbin <adurbin@google.com> | 2015-03-20 19:28:52 +0100 |
commit | f5d7f605aba97451f3116cf6489c0e31b5554427 (patch) | |
tree | 760c54276be0be592ef0456ccd874ed179402322 /src/mainboard/emulation/qemu-riscv/bootblock.c | |
parent | e4f3e7a9c656356a92e827d5a39b85106cbdaf3a (diff) | |
download | coreboot-f5d7f605aba97451f3116cf6489c0e31b5554427.tar.xz |
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/mainboard/emulation/qemu-riscv/bootblock.c')
-rw-r--r-- | src/mainboard/emulation/qemu-riscv/bootblock.c | 14 |
1 files changed, 2 insertions, 12 deletions
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 <arch/exception.h> -#include <arch/hlt.h> #include <bootblock_common.h> -#include <cbfs.h> #include <console/console.h> -#include <arch/stages.h> +#include <program_loading.h> // 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(); } |