summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/riscv/boot.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c
index d07d825d96..ab4ae95a19 100644
--- a/src/arch/riscv/boot.c
+++ b/src/arch/riscv/boot.c
@@ -18,11 +18,19 @@
*/
#include <program_loading.h>
+#include <vm.h>
+#include <arch/encoding.h>
+#include <rules.h>
void arch_prog_run(struct prog *prog)
{
- void (*doit)(void *);
+ void (*doit)(void *) = prog_entry(prog);
- doit = prog_entry(prog);
- doit(prog_entry_arg(prog));
+ if (ENV_RAMSTAGE && prog_type(prog) == ASSET_PAYLOAD) {
+ initVirtualMemory();
+ write_csr(mepc, doit);
+ asm volatile("eret");
+ } else {
+ doit(prog_entry_arg(prog));
+ }
}