[coreboot-gerrit] Patch set updated for coreboot: arch/riscv: Change all eret instructions to .word 0x30200073 (mret)

[Jonathan Neuschäfer (j.neuschaefer@gmx.net)]

Jonathan Neuschäfer (j.neuschaefer at gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15290

-gerrit

commit ad6ce04c9e86c2ff7e63054ed55da49fcf5b2562
Author: Jonathan Neuschäfer <j.neuschaefer at gmx.net>
Date:   Mon Jul 18 17:56:59 2016 +0200

    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 at gmx.net>
---
 src/arch/riscv/trap_util.S | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/arch/riscv/trap_util.S b/src/arch/riscv/trap_util.S
index 0118ffc..82a5629 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