diff --git a/APP_Framework/Framework/transform_layer/xiuos/user_api/switch_api/user_api.h b/APP_Framework/Framework/transform_layer/xiuos/user_api/switch_api/user_api.h
index 898a61ab0..161e6add9 100644
--- a/APP_Framework/Framework/transform_layer/xiuos/user_api/switch_api/user_api.h
+++ b/APP_Framework/Framework/transform_layer/xiuos/user_api/switch_api/user_api.h
@@ -22,6 +22,7 @@
 #ifndef XS_USER_API_H
 #define XS_USER_API_H
 
+#include <xiuos.h>
 #include <xsconfig.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/Ubiquitous/XiUOS/board/cortex-m3-emulator/.defconfig b/Ubiquitous/XiUOS/board/cortex-m3-emulator/.defconfig
index bff68ddf8..1b0f2cf08 100644
--- a/Ubiquitous/XiUOS/board/cortex-m3-emulator/.defconfig
+++ b/Ubiquitous/XiUOS/board/cortex-m3-emulator/.defconfig
@@ -4,11 +4,6 @@
 #
 CONFIG_BOARD_CORTEX_M3_EVB=y
 CONFIG_KERNEL_CONSOLE_DEVICE_NAME="uart0"
-#CONFIG_LED0=24
-#CONFIG_LED1=25
-CONFIG_ARCH_RISCV=y
-CONFIG_ARCH_RISCV32=y
-CONFIG_ARCH_CPU_32BIT=y
 
 #
 # cortex-m3-emulator feature
@@ -41,7 +36,7 @@ CONFIG___STACKSIZE__=4096
 CONFIG_RESOURCES_SERIAL=y
 # CONFIG_SERIAL_USING_DMA=y
 CONFIG_SERIAL_RB_BUFSZ=64
-CONFIG_FS_VFS=n
+CONFIG_FS_VFS=y
 # CONFIG_RESOURCES_HWTIMER is not set
 # CONFIG_RESOURCES_I2C is not set
 # CONFIG_RESOURCES_LCD is not set
@@ -100,8 +95,8 @@ CONFIG_SMALL_NUMBER_64B=16
 #
 # CONFIG_KERNEL_SEMAPHORE=y
 # CONFIG_KERNEL_MUTEX=y
-CONFIG_KERNEL_EVENT=n
-CONFIG_KERNEL_MESSAGEQUEUE=n
+CONFIG_KERNEL_EVENT=y
+CONFIG_KERNEL_MESSAGEQUEUE=y
 CONFIG_KTASK_PRIORITY_8=y
 CONFIG_KTASK_PRIORITY_MAX=8
 CONFIG_TICK_PER_SECOND=100
@@ -115,11 +110,6 @@ CONFIG_IDLE_KTASK_STACKSIZE=512
 CONFIG_ZOMBIE_KTASK_STACKSIZE=512
 # CONFIG_KERNEL_TASK_ISOLATION is not set
 
-#
-# Memory Management
-#
-# CONFIG_KERNEL_MEMBLOCK is not set
-
 #
 # Command shell
 #
diff --git a/Ubiquitous/XiUOS/board/hifive1-emulator/.defconfig b/Ubiquitous/XiUOS/board/hifive1-emulator/.defconfig
index c6451fff5..1502a964d 100644
--- a/Ubiquitous/XiUOS/board/hifive1-emulator/.defconfig
+++ b/Ubiquitous/XiUOS/board/hifive1-emulator/.defconfig
@@ -41,7 +41,7 @@ CONFIG___STACKSIZE__=1024
 CONFIG_RESOURCES_SERIAL=y
 # CONFIG_SERIAL_USING_DMA=y
 CONFIG_SERIAL_RB_BUFSZ=64
-CONFIG_FS_VFS=n
+CONFIG_FS_VFS=y
 # CONFIG_RESOURCES_HWTIMER is not set
 # CONFIG_RESOURCES_I2C is not set
 # CONFIG_RESOURCES_LCD is not set
@@ -98,8 +98,8 @@ CONFIG_MM_PAGE_SIZE=1024
 #
 # CONFIG_KERNEL_SEMAPHORE=y
 # CONFIG_KERNEL_MUTEX=y
-CONFIG_KERNEL_EVENT=n
-CONFIG_KERNEL_MESSAGEQUEUE=n
+CONFIG_KERNEL_EVENT=y
+CONFIG_KERNEL_MESSAGEQUEUE=y
 CONFIG_KTASK_PRIORITY_8=y
 CONFIG_KTASK_PRIORITY_MAX=8
 CONFIG_TICK_PER_SECOND=100
@@ -113,11 +113,6 @@ CONFIG_IDLE_KTASK_STACKSIZE=512
 CONFIG_ZOMBIE_KTASK_STACKSIZE=512
 # CONFIG_KERNEL_TASK_ISOLATION is not set
 
-#
-# Memory Management
-#
-# CONFIG_KERNEL_MEMBLOCK is not set
-
 #
 # Command shell
 #
diff --git a/Ubiquitous/XiUOS/board/hifive1-rev-B/.defconfig b/Ubiquitous/XiUOS/board/hifive1-rev-B/.defconfig
index 26e9621e7..3c68a127e 100644
--- a/Ubiquitous/XiUOS/board/hifive1-rev-B/.defconfig
+++ b/Ubiquitous/XiUOS/board/hifive1-rev-B/.defconfig
@@ -41,7 +41,7 @@ CONFIG___STACKSIZE__=1024
 CONFIG_RESOURCES_SERIAL=y
 # CONFIG_SERIAL_USING_DMA=y
 CONFIG_SERIAL_RB_BUFSZ=64
-CONFIG_FS_VFS=n
+CONFIG_FS_VFS=y
 # CONFIG_RESOURCES_HWTIMER is not set
 # CONFIG_RESOURCES_I2C is not set
 # CONFIG_RESOURCES_LCD is not set
@@ -98,8 +98,8 @@ CONFIG_MM_PAGE_SIZE=1024
 #
 # CONFIG_KERNEL_SEMAPHORE=y
 # CONFIG_KERNEL_MUTEX=y
-CONFIG_KERNEL_EVENT=n
-CONFIG_KERNEL_MESSAGEQUEUE=n
+CONFIG_KERNEL_EVENT=y
+CONFIG_KERNEL_MESSAGEQUEUE=y
 CONFIG_KTASK_PRIORITY_8=y
 CONFIG_KTASK_PRIORITY_MAX=8
 CONFIG_TICK_PER_SECOND=100
@@ -113,11 +113,6 @@ CONFIG_IDLE_KTASK_STACKSIZE=512
 CONFIG_ZOMBIE_KTASK_STACKSIZE=512
 # CONFIG_KERNEL_TASK_ISOLATION is not set
 
-#
-# Memory Management
-#
-# CONFIG_KERNEL_MEMBLOCK is not set
-
 #
 # Command shell
 #