diff --git a/arch/risc-v/src/common/riscv_fpu.S b/arch/risc-v/src/common/riscv_fpu.S
index ba35db263f..b5d11f8fde 100644
--- a/arch/risc-v/src/common/riscv_fpu.S
+++ b/arch/risc-v/src/common/riscv_fpu.S
@@ -36,7 +36,7 @@
  * Public Symbols
  ************************************************************************************/
 
-    .globl        up_fpuconfig
+    .globl        riscv_fpuconfig
     .globl        riscv_savefpu
     .globl        riscv_restorefpu
 
@@ -72,13 +72,13 @@
  ************************************************************************************/
 
 /************************************************************************************
- * Name: up_fpuconfig
+ * Name: riscv_fpuconfig
  *
  * Description:
  *   init fpu
  *
  * C Function Prototype:
- *   void up_fpuconfig(void);
+ *   void riscv_fpuconfig(void);
  *
  * Input Parameters:
  *   None
@@ -88,9 +88,9 @@
  *
  ************************************************************************************/
 
-    .type        up_fpuconfig, function
+    .type        riscv_fpuconfig, function
 
-up_fpuconfig:
+riscv_fpuconfig:
     li           a0, FS_INITIAL
     csrs         mstatus, a0
     csrwi        fcsr, 0
diff --git a/arch/risc-v/src/common/riscv_internal.h b/arch/risc-v/src/common/riscv_internal.h
index be7967e8ec..6787d1f292 100644
--- a/arch/risc-v/src/common/riscv_internal.h
+++ b/arch/risc-v/src/common/riscv_internal.h
@@ -204,9 +204,11 @@ int riscv_swint(int irq, void *context, void *arg);
 uintptr_t riscv_get_newintctx(void);
 
 #ifdef CONFIG_ARCH_FPU
+void riscv_fpuconfig(void);
 void riscv_savefpu(uintptr_t *regs);
 void riscv_restorefpu(const uintptr_t *regs);
 #else
+#  define riscv_fpuconfig()
 #  define riscv_savefpu(regs)
 #  define riscv_restorefpu(regs)
 #endif