diff --git a/SConscript b/SConscript
index 071196df..3fd432af 100644
--- a/SConscript
+++ b/SConscript
@@ -265,6 +265,7 @@ if GetDepend(['PKG_CHERRYUSB_HOST']):
         src += Glob('class/vendor/serial/usbh_pl2303.c')
 
     if GetDepend(['PKG_CHERRYUSB_HOST_TEMPLATE']):
+        CPPDEFINES+=['TEST_USBH_MSC=0']
         src += Glob('demo/usb_host.c')
 
     if GetDepend('RT_USING_DFS') and GetDepend(['PKG_CHERRYUSB_HOST_MSC']):
diff --git a/platform/rtthread/usbh_dfs.c b/platform/rtthread/usbh_dfs.c
index eee64a0b..128d2345 100644
--- a/platform/rtthread/usbh_dfs.c
+++ b/platform/rtthread/usbh_dfs.c
@@ -11,11 +11,15 @@
 
 #define DEV_FORMAT "/dev/sd%c"
 
+#ifndef RT_USING_DFS_ELMFAT
+#error "RT_USING_DFS_ELMFAT must be enabled to use USB mass storage device"
+#endif
+
 #ifndef CONFIG_USB_DFS_MOUNT_POINT
 #define CONFIG_USB_DFS_MOUNT_POINT "/"
 #endif
 
-#if defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) || \
+#if defined(SOC_SERIES_STM32H7) || defined(SOC_SERIES_STM32F7) || defined(SOC_SERIES_STM32H7RS) ||\
     defined(SOC_HPM5000) || defined(SOC_HPM6000) || defined(SOC_HPM6E00) || defined(BSP_USING_BL61X)
 #ifndef RT_USING_CACHE
 #error usbh msc must enable RT_USING_CACHE in this chip