summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/arch/riscv/payload.S5
-rw-r--r--src/arch/riscv/trap_util.S4
2 files changed, 3 insertions, 6 deletions
diff --git a/src/arch/riscv/payload.S b/src/arch/riscv/payload.S
index ce88bc3f64..a189adf1db 100644
--- a/src/arch/riscv/payload.S
+++ b/src/arch/riscv/payload.S
@@ -24,7 +24,4 @@ riscvpayload:
li t2, (1<<11)
or t0, t0, t2
csrw mstatus, t0
-
- // We're still in toolchain no mans land.
- .word 0x30200073
- //mret
+ mret
diff --git a/src/arch/riscv/trap_util.S b/src/arch/riscv/trap_util.S
index ae32379562..44cfab7c99 100644
--- a/src/arch/riscv/trap_util.S
+++ b/src/arch/riscv/trap_util.S
@@ -141,10 +141,10 @@ supervisor_call_return:
csrr a0, mscratch
restore_regs
# go back into supervisor call
- .word 0x30200073 # mret
+ mret
.global machine_call_return
machine_call_return:
csrr a0, mscratch
restore_regs
# go back into machine call
- .word 0x30200073 # mret
+ mret