diff --git a/arch/risc-v/src/mpfs/mpfs_opensbi.c b/arch/risc-v/src/mpfs/mpfs_opensbi.c
index 769e9075a0..866c29fa20 100644
--- a/arch/risc-v/src/mpfs/mpfs_opensbi.c
+++ b/arch/risc-v/src/mpfs/mpfs_opensbi.c
@@ -225,7 +225,7 @@ static const struct sbi_platform platform =
 
 /* This must go into l2_scratchpad region, starting at 0x0a000000. */
 
-sbi_scratch_holder_t g_scratches[MPFS_MAX_NUM_HARTS] \
+sbi_scratch_holder_t g_scratches[0] \
                __attribute__((section(".l2_scratchpad")));
 
 /****************************************************************************
diff --git a/arch/risc-v/src/mpfs/mpfs_opensbi_utils.S b/arch/risc-v/src/mpfs/mpfs_opensbi_utils.S
index 92627feb25..b933bdb5d4 100644
--- a/arch/risc-v/src/mpfs/mpfs_opensbi_utils.S
+++ b/arch/risc-v/src/mpfs/mpfs_opensbi_utils.S
@@ -103,7 +103,6 @@ mpfs_opensbi_prepare_hart:
   mul  t0, a0, t1
   la   sp, g_scratches
   add  sp, sp, t0
-  add  sp, sp, t1
   jal  mpfs_opensbi_setup
 
 /****************************************************************************