diff --git a/arch/risc-v/src/mpfs/mpfs_opensbi_trap.S b/arch/risc-v/src/mpfs/mpfs_opensbi_trap.S
index e046861201e13..87000330c4b9c 100644
--- a/arch/risc-v/src/mpfs/mpfs_opensbi_trap.S
+++ b/arch/risc-v/src/mpfs/mpfs_opensbi_trap.S
@@ -166,8 +166,10 @@ mpfs_global_pointer:
 
   /*  Restore GP */
 
-  la      a0, mpfs_global_pointer
-  ld      gp, 0(a0)
+  .option push
+  .option norelax
+  la      gp, __global_pointer$
+  .option pop
 
   /* Call C routine */
 
diff --git a/arch/risc-v/src/mpfs/mpfs_opensbi_utils.S b/arch/risc-v/src/mpfs/mpfs_opensbi_utils.S
index 9f43b5bb16621..6f623ed560def 100644
--- a/arch/risc-v/src/mpfs/mpfs_opensbi_utils.S
+++ b/arch/risc-v/src/mpfs/mpfs_opensbi_utils.S
@@ -121,13 +121,6 @@ mpfs_opensbi_prepare_hart:
   la   t0, mpfs_exception_opensbi
   csrw mtvec, t0
 
-  /* la gp, __global_pointer$ will not work. We want to have the gp as seen
-   * in the .map file exactly. We need to restore gp in the trap handler.
-   */
-
-  la   t0, mpfs_global_pointer
-  ld   gp, 0(t0)
-
   /* Setup stacks per hart, the stack top is the end of the hart's scratch */
 
   csrr a0, mhartid