summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Neuschäfer <j.neuschaefer@gmx.net>2016-07-18 17:56:59 +0200
committerRonald G. Minnich <rminnich@gmail.com>2016-07-18 22:50:33 +0200
commitb8e67acc919cff0494607dbd470257d2651cb8e8 (patch)
tree2ce133a578c11aa72bb6a727e44ced5f8dd555f4
parent5d687add8531e3849189959e68a812a14fa01c0c (diff)
downloadcoreboot-b8e67acc919cff0494607dbd470257d2651cb8e8.tar.xz
arch/riscv: Change all eret instructions to .word 0x30200073 (mret)
Using the opcode directly is necessary for the transition to the GCC 6.1.0 based toolchain, because the old toolchain only supports eret and the new toolchain only supports mret. Change-Id: I17e14d4793ae5259f7ce3ce0211cbb27305506cc Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net> Reviewed-on: https://review.coreboot.org/15290 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
-rw-r--r--src/arch/riscv/trap_util.S6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/arch/riscv/trap_util.S b/src/arch/riscv/trap_util.S
index 0118ffcfe0..82a5629f4c 100644
--- a/src/arch/riscv/trap_util.S
+++ b/src/arch/riscv/trap_util.S
@@ -124,9 +124,11 @@ trap_entry:
supervisor_call_return:
csrr a0, mscratch
restore_regs
- eret # go back into supervisor call
+ # go back into supervisor call
+ .word 0x30200073 # mret
.global machine_call_return
machine_call_return:
csrr a0, mscratch
restore_regs
- eret # go back into machine call
+ # go back into machine call
+ .word 0x30200073 # mret