From 8ba14423e34a161e8916e6780cde51e05959951b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20Neusch=C3=A4fer?= <j.neuschaefer@gmx.net>
Date: Fri, 10 Jun 2016 19:35:14 +0200
Subject: [PATCH] UPSTREAM: arch/riscv/trap_util.S: Use "li" pseudo-instruction
 to load a constant

BUG=None
BRANCH=None
TEST=None

Change-Id: I9759771fa6fc708d7d97509c5f5e0cefb8ab4c96
Original-Signed-off-by: Jonathan Neuschfer <j.neuschaefer@gmx.net>
Original-Reviewed-on: https://review.coreboot.org/14962
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/352022
Commit-Ready: Furquan Shaikh <furquan@chromium.org>
Tested-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
---
 src/arch/riscv/trap_util.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/arch/riscv/trap_util.S b/src/arch/riscv/trap_util.S
index bc09dc92cb..0118ffcfe0 100644
--- a/src/arch/riscv/trap_util.S
+++ b/src/arch/riscv/trap_util.S
@@ -108,7 +108,7 @@
 supervisor_trap_entry:
     csrw mscratch, sp
     # load in the top of the machine stack
-    la sp, 0x80FFF0 - 64
+    li sp, 0x80FFF0 - 64
     1:addi sp,sp,-320
     save_tf
     move  a0,sp