diff --git a/bsp/qemu-virt-rv64/.config b/bsp/qemu-virt64-riscv/.config
similarity index 100%
rename from bsp/qemu-virt-rv64/.config
rename to bsp/qemu-virt64-riscv/.config
diff --git a/bsp/qemu-virt-rv64/.gitignore b/bsp/qemu-virt64-riscv/.gitignore
similarity index 100%
rename from bsp/qemu-virt-rv64/.gitignore
rename to bsp/qemu-virt64-riscv/.gitignore
diff --git a/bsp/qemu-virt-rv64/Kconfig b/bsp/qemu-virt64-riscv/Kconfig
similarity index 100%
rename from bsp/qemu-virt-rv64/Kconfig
rename to bsp/qemu-virt64-riscv/Kconfig
diff --git a/bsp/qemu-virt-rv64/SConscript b/bsp/qemu-virt64-riscv/SConscript
similarity index 100%
rename from bsp/qemu-virt-rv64/SConscript
rename to bsp/qemu-virt64-riscv/SConscript
diff --git a/bsp/qemu-virt-rv64/SConstruct b/bsp/qemu-virt64-riscv/SConstruct
similarity index 100%
rename from bsp/qemu-virt-rv64/SConstruct
rename to bsp/qemu-virt64-riscv/SConstruct
diff --git a/bsp/qemu-virt-rv64/applications/SConscript b/bsp/qemu-virt64-riscv/applications/SConscript
similarity index 100%
rename from bsp/qemu-virt-rv64/applications/SConscript
rename to bsp/qemu-virt64-riscv/applications/SConscript
diff --git a/bsp/qemu-virt-rv64/applications/main.c b/bsp/qemu-virt64-riscv/applications/main.c
similarity index 100%
rename from bsp/qemu-virt-rv64/applications/main.c
rename to bsp/qemu-virt64-riscv/applications/main.c
diff --git a/bsp/qemu-virt-rv64/driver/Kconfig b/bsp/qemu-virt64-riscv/driver/Kconfig
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/Kconfig
rename to bsp/qemu-virt64-riscv/driver/Kconfig
diff --git a/bsp/qemu-virt-rv64/driver/SConscript b/bsp/qemu-virt64-riscv/driver/SConscript
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/SConscript
rename to bsp/qemu-virt64-riscv/driver/SConscript
diff --git a/bsp/qemu-virt-rv64/driver/asm/sbiasm.h b/bsp/qemu-virt64-riscv/driver/asm/sbiasm.h
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/asm/sbiasm.h
rename to bsp/qemu-virt64-riscv/driver/asm/sbiasm.h
diff --git a/bsp/qemu-virt-rv64/driver/asm/sbidef.h b/bsp/qemu-virt64-riscv/driver/asm/sbidef.h
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/asm/sbidef.h
rename to bsp/qemu-virt64-riscv/driver/asm/sbidef.h
diff --git a/bsp/qemu-virt-rv64/driver/board.c b/bsp/qemu-virt64-riscv/driver/board.c
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/board.c
rename to bsp/qemu-virt64-riscv/driver/board.c
diff --git a/bsp/qemu-virt-rv64/driver/board.h b/bsp/qemu-virt64-riscv/driver/board.h
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/board.h
rename to bsp/qemu-virt64-riscv/driver/board.h
diff --git a/bsp/qemu-virt-rv64/driver/drv_uart.c b/bsp/qemu-virt64-riscv/driver/drv_uart.c
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/drv_uart.c
rename to bsp/qemu-virt64-riscv/driver/drv_uart.c
diff --git a/bsp/qemu-virt-rv64/driver/drv_uart.h b/bsp/qemu-virt64-riscv/driver/drv_uart.h
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/drv_uart.h
rename to bsp/qemu-virt64-riscv/driver/drv_uart.h
diff --git a/bsp/qemu-virt-rv64/driver/encoding.h b/bsp/qemu-virt64-riscv/driver/encoding.h
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/encoding.h
rename to bsp/qemu-virt64-riscv/driver/encoding.h
diff --git a/bsp/qemu-virt-rv64/driver/io.h b/bsp/qemu-virt64-riscv/driver/io.h
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/io.h
rename to bsp/qemu-virt64-riscv/driver/io.h
diff --git a/bsp/qemu-virt-rv64/driver/plic.c b/bsp/qemu-virt64-riscv/driver/plic.c
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/plic.c
rename to bsp/qemu-virt64-riscv/driver/plic.c
diff --git a/bsp/qemu-virt-rv64/driver/plic.h b/bsp/qemu-virt64-riscv/driver/plic.h
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/plic.h
rename to bsp/qemu-virt64-riscv/driver/plic.h
diff --git a/bsp/qemu-virt-rv64/driver/sbi.h b/bsp/qemu-virt64-riscv/driver/sbi.h
similarity index 100%
rename from bsp/qemu-virt-rv64/driver/sbi.h
rename to bsp/qemu-virt64-riscv/driver/sbi.h
diff --git a/bsp/qemu-virt-rv64/link.lds b/bsp/qemu-virt64-riscv/link.lds
similarity index 100%
rename from bsp/qemu-virt-rv64/link.lds
rename to bsp/qemu-virt64-riscv/link.lds
diff --git a/bsp/qemu-virt-rv64/link_stacksize.lds b/bsp/qemu-virt64-riscv/link_stacksize.lds
similarity index 100%
rename from bsp/qemu-virt-rv64/link_stacksize.lds
rename to bsp/qemu-virt64-riscv/link_stacksize.lds
diff --git a/bsp/qemu-virt-rv64/qemu-dbg.sh b/bsp/qemu-virt64-riscv/qemu-dbg.sh
similarity index 100%
rename from bsp/qemu-virt-rv64/qemu-dbg.sh
rename to bsp/qemu-virt64-riscv/qemu-dbg.sh
diff --git a/bsp/qemu-virt-rv64/qemu-dumpdtb.sh b/bsp/qemu-virt64-riscv/qemu-dumpdtb.sh
similarity index 100%
rename from bsp/qemu-virt-rv64/qemu-dumpdtb.sh
rename to bsp/qemu-virt64-riscv/qemu-dumpdtb.sh
diff --git a/bsp/qemu-virt-rv64/qemu-nographic.sh b/bsp/qemu-virt64-riscv/qemu-nographic.sh
similarity index 100%
rename from bsp/qemu-virt-rv64/qemu-nographic.sh
rename to bsp/qemu-virt64-riscv/qemu-nographic.sh
diff --git a/bsp/qemu-virt-rv64/rtconfig.h b/bsp/qemu-virt64-riscv/rtconfig.h
similarity index 100%
rename from bsp/qemu-virt-rv64/rtconfig.h
rename to bsp/qemu-virt64-riscv/rtconfig.h
diff --git a/bsp/qemu-virt-rv64/rtconfig.py b/bsp/qemu-virt64-riscv/rtconfig.py
similarity index 100%
rename from bsp/qemu-virt-rv64/rtconfig.py
rename to bsp/qemu-virt64-riscv/rtconfig.py
diff --git a/components/finsh/msh.c b/components/finsh/msh.c
index 34b7b955bd317bc98fe0e9d39b425976ae862251..08f4315a4ee21ec47d02139c342d4009b773ac44 100644
--- a/components/finsh/msh.c
+++ b/components/finsh/msh.c
@@ -19,6 +19,7 @@
 
 #include "msh.h"
 #include "shell.h"
+#include <string.h>
 
 #ifdef RT_USING_DFS
 #include <dfs_posix.h>
diff --git a/components/lwp/ioremap.c b/components/lwp/ioremap.c
index 4fe03a4a93ee81f727460dd5d26b2e01381e33e2..2d0b564ded692c1c08b99491cd16494a12533b0f 100644
--- a/components/lwp/ioremap.c
+++ b/components/lwp/ioremap.c
@@ -36,7 +36,7 @@ static void _iounmap_range(void *addr, size_t size)
     }
 }
 
-static void *_ioremap_type(void *p_addr, size_t size, int type)
+static void *_ioremap_type(void *paddr, size_t size, int type)
 {
     rt_base_t level;
     void *v_addr = NULL;
@@ -55,7 +55,7 @@ static void *_ioremap_type(void *p_addr, size_t size, int type)
     }
 
     level = rt_hw_interrupt_disable();
-    v_addr = rt_hw_mmu_map(&mmu_info, 0, p_addr, size, attr);
+    v_addr = rt_hw_mmu_map(&mmu_info, 0, paddr, size, attr);
     if (v_addr)
     {
         int ret = lwp_map_area_insert(&k_map_area, (size_t)v_addr, size, type);
@@ -69,36 +69,36 @@ static void *_ioremap_type(void *p_addr, size_t size, int type)
     return v_addr;
 }
 
-void *rt_ioremap(void *p_addr, size_t size)
+void *rt_ioremap(void *paddr, size_t size)
 {
-    return _ioremap_type(p_addr, size, MM_AREA_TYPE_PHY);
+    return _ioremap_type(paddr, size, MM_AREA_TYPE_PHY);
 }
 
-void *rt_ioremap_nocache(void *p_addr, size_t size)
+void *rt_ioremap_nocache(void *paddr, size_t size)
 {
-    return _ioremap_type(p_addr, size, MM_AREA_TYPE_PHY);
+    return _ioremap_type(paddr, size, MM_AREA_TYPE_PHY);
 }
 
-void *rt_ioremap_cached(void *p_addr, size_t size)
+void *rt_ioremap_cached(void *paddr, size_t size)
 {
-    return _ioremap_type(p_addr, size, MM_AREA_TYPE_PHY_CACHED);
+    return _ioremap_type(paddr, size, MM_AREA_TYPE_PHY_CACHED);
 }
 
 #else
 
-void *rt_ioremap(void *p_addr, size_t size)
+void *rt_ioremap(void *paddr, size_t size)
 {
-    return p_addr;
+    return paddr;
 }
 
 void *rt_ioremap_nocache(void *paddr, size_t size)
 {
-    return p_addr;
+    return paddr;
 }
 
 void *rt_ioremap_cached(void *paddr, size_t size)
 {
-    return p_addr;
+    return paddr;
 }
 
 #endif
diff --git a/components/lwp/ioremap.h b/components/lwp/ioremap.h
index 460f16c8d28735d5e5e630a5e9b1752254f7f484..a2d64523f102f97d883967d67332fa8147e2a4f4 100644
--- a/components/lwp/ioremap.h
+++ b/components/lwp/ioremap.h
@@ -15,11 +15,8 @@ extern "C" {
 #endif
 
 void *rt_ioremap(void *paddr, size_t size);
-
 void *rt_ioremap_nocache(void *paddr, size_t size);
-
-void *rt_ioremap_cached(void *paddr, size_t size);
-
+void *rt_ioremap_cached (void *paddr, size_t size);
 void rt_iounmap(volatile void *addr);
 
 #ifdef __cplusplus
diff --git a/include/rtdef.h b/include/rtdef.h
index 5bd59cbf2f8c0655b8822e1de470eda25fed4800..1e7f5167bab1e74f277c881d68c9eb6d14aea4b4 100644
--- a/include/rtdef.h
+++ b/include/rtdef.h
@@ -200,8 +200,6 @@ typedef rt_base_t                       rt_off_t;       /**< Type for offset */
     #error not supported tool chain
 #endif
 
-#include <cpuport.h>
-
 /* initialization export */
 #ifdef RT_USING_COMPONENTS_INIT
 typedef int (*init_fn_t)(void);
diff --git a/include/rthw.h b/include/rthw.h
index 1505a1b46f04d37fbf858913f97bbc5066ab515a..f86618a5752b89c153a95c5291c1007047a9e263 100644
--- a/include/rthw.h
+++ b/include/rthw.h
@@ -200,6 +200,14 @@ typedef int rt_spinlock_t;
 
 #endif
 
+#ifdef RT_USING_CACHE
+#include <cpuport.h>
+#else
+#define rt_hw_isb()
+#define rt_hw_dmb()
+#define rt_hw_dsb()
+#endif
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/include/rtthread.h b/include/rtthread.h
index b4fb360f7cd8255e27220aeb8524799ed97c6342..1a39fad9d862bf6138544e64ad467029501479c6 100644
--- a/include/rtthread.h
+++ b/include/rtthread.h
@@ -22,7 +22,6 @@
 #include <rtconfig.h>
 #include <rtdebug.h>
 #include <rtdef.h>
-#include <cpuport.h>
 #include <rtservice.h>
 #include <rtm.h>