diff options
| author | Jonathan Neuschäfer <j.neuschaefer@gmx.net> | 2016-07-07 20:53:29 +0200 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2016-07-14 18:23:27 +0200 |
| commit | 455c3c90643a3a9626af9bc84f6b3dc38f1c6aaf (patch) | |
| tree | 170fa3980db91aad6a8038e3d864731ed12e89ca | |
| parent | c98aac05890f65a17e87c50d6b1f3e662f59002e (diff) | |
arch/riscv: Unconditionally start payloads in machine mode
Ron Minnich writes: "we'll change cbfstool to put a header on the
payload to jump to supervisor if that is desired. The principal here is
that payloads are always started in machine mode, but we want to set the
page tables up for them."
Change-Id: I5cbfc90afd3febab33835935f08005136a3f47e9
Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Reviewed-on: https://review.coreboot.org/15510
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
| -rw-r--r-- | src/arch/riscv/boot.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/arch/riscv/boot.c b/src/arch/riscv/boot.c index 96526bf64b..743549081d 100644 --- a/src/arch/riscv/boot.c +++ b/src/arch/riscv/boot.c @@ -24,11 +24,9 @@ void arch_prog_run(struct prog *prog) if (ENV_RAMSTAGE && prog_type(prog) == PROG_PAYLOAD) { initVirtualMemory(); - write_csr(mepc, doit); - asm volatile("eret"); - } else { - doit(prog_entry_arg(prog)); } + + doit(prog_entry_arg(prog)); } int arch_supports_bounce_buffer(void) |