diff --git a/bsp/hpmicro/hpm6750evk/board/SConscript b/bsp/hpmicro/hpm6750evk/board/SConscript
index b0557f0945..9837cef2fc 100644
--- a/bsp/hpmicro/hpm6750evk/board/SConscript
+++ b/bsp/hpmicro/hpm6750evk/board/SConscript
@@ -10,6 +10,7 @@ src = Split("""
     eth_phy_port.c
     fal_flash_port.c
     hpm_sgtl5000.c
+    trap_gcc.S
 """)
 
 CPPPATH = [cwd]
diff --git a/libcpu/risc-v/hpmicro/trap_gcc.S b/bsp/hpmicro/hpm6750evk/board/trap_gcc.S
similarity index 100%
rename from libcpu/risc-v/hpmicro/trap_gcc.S
rename to bsp/hpmicro/hpm6750evk/board/trap_gcc.S
diff --git a/bsp/hpmicro/hpm6750evkmini/board/SConscript b/bsp/hpmicro/hpm6750evkmini/board/SConscript
index 6245c5f443..1444a9e948 100644
--- a/bsp/hpmicro/hpm6750evkmini/board/SConscript
+++ b/bsp/hpmicro/hpm6750evkmini/board/SConscript
@@ -10,6 +10,7 @@ src = Split("""
     rw007_port.c
     eth_phy_port.c
     fal_flash_port.c
+    trap_gcc.S
 """)
 
 CPPPATH = [cwd]
diff --git a/bsp/hpmicro/hpm6750evkmini/board/trap_gcc.S b/bsp/hpmicro/hpm6750evkmini/board/trap_gcc.S
new file mode 100644
index 0000000000..40de7b31c5
--- /dev/null
+++ b/bsp/hpmicro/hpm6750evkmini/board/trap_gcc.S
@@ -0,0 +1,12 @@
+#include "cpuport.h"
+
+	.globl rt_hw_do_after_save_above
+	.type rt_hw_do_after_save_above,@function
+rt_hw_do_after_save_above:
+	addi  sp, sp,  -4
+    STORE ra,  0 * REGBYTES(sp)
+    csrr  a0, mscratch
+    call  trap_entry
+    LOAD  ra,  0 * REGBYTES(sp)
+    addi  sp, sp,  4
+    ret
\ No newline at end of file
diff --git a/libcpu/risc-v/hpmicro/SConscript b/libcpu/risc-v/hpmicro/SConscript
deleted file mode 100644
index 7a7620168b..0000000000
--- a/libcpu/risc-v/hpmicro/SConscript
+++ /dev/null
@@ -1,18 +0,0 @@
-# RT-Thread building script for component
-
-from building import *
-
-Import('rtconfig')
-
-cwd     = GetCurrentDir()
-src     = Glob('*.c') + Glob('*.cpp')
-
-if rtconfig.PLATFORM == 'gcc':
-     src += Glob('*_gcc.S')
-
-CPPPATH = [cwd]
-ASFLAGS = ' -I ' + cwd
-
-group = DefineGroup('CPU', src, depend = [''], CPPPATH = CPPPATH, ASFLAGS = ASFLAGS)
-
-Return('group')