diff --git a/.gitignore b/.gitignore
index c35f46609f5..0d4164b50ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,8 @@ documentation/html
 *.a
 *.i
 *.d
+#source insight 4 project files
+*.si4project 
 tools/kconfig-frontends/kconfig-mconf
 packages
 dist
diff --git a/bsp/stm32/stm32l496-ali-developer/board/mnt.c b/bsp/stm32/stm32l496-ali-developer/board/mnt.c
index 33edf6674e9..a8567e9d270 100644
--- a/bsp/stm32/stm32l496-ali-developer/board/mnt.c
+++ b/bsp/stm32/stm32l496-ali-developer/board/mnt.c
@@ -25,7 +25,6 @@ int mnt_init(void)
 {
 #ifdef BSP_USING_ON_CHIP_FLASH
     fal_init();
-
 #define FS_PARTITION_NAME "flash"
     struct rt_device *mtd_dev;
     mtd_dev = fal_blk_device_create(FS_PARTITION_NAME);
@@ -46,11 +45,9 @@ int mnt_init(void)
             LOG_I("Failed to initialize filesystem!");
         }
     }
-#endif
-
-#endif
+#endif /* BSP_USING_ON_CHIP_FLASH_FATFS */
+#endif /* BSP_USING_ON_CHIP_FLASH */
     return 0;
 }
 INIT_ENV_EXPORT(mnt_init);
-#endif
-
+#endif /* RT_USING_DFS */
diff --git a/bsp/stm32/stm32l496-st-nucleo/board/SConscript b/bsp/stm32/stm32l496-st-nucleo/board/SConscript
index 617f20c65ce..cf0e190c8b7 100644
--- a/bsp/stm32/stm32l496-st-nucleo/board/SConscript
+++ b/bsp/stm32/stm32l496-st-nucleo/board/SConscript
@@ -13,8 +13,7 @@ CubeMX_Config/Src/stm32l4xx_hal_msp.c
 ''')
 
 if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
-    src += Glob('mnt_onchip.c')
-
+    src += Glob('mnt.c')
 
 path =  [cwd]
 path += [cwd + '/CubeMX_Config/Inc']
diff --git a/bsp/stm32/stm32l496-st-nucleo/board/mnt_onchip.c b/bsp/stm32/stm32l496-st-nucleo/board/mnt.c
similarity index 72%
rename from bsp/stm32/stm32l496-st-nucleo/board/mnt_onchip.c
rename to bsp/stm32/stm32l496-st-nucleo/board/mnt.c
index 4515d58bf45..b3d1c5f8b01 100644
--- a/bsp/stm32/stm32l496-st-nucleo/board/mnt_onchip.c
+++ b/bsp/stm32/stm32l496-st-nucleo/board/mnt.c
@@ -12,7 +12,10 @@
 #include <rtdevice.h>
 
 #include "fal.h"
-#include <dfs_fs.h>
+
+#define DBG_TAG    "mnt"
+#define DBG_LVL    DBG_INFO
+#include <rtdbg.h>
 
 #ifdef RT_USING_DFS
 #include <dfs_fs.h>
@@ -26,25 +29,24 @@ int mnt_init(void)
     mtd_dev = fal_blk_device_create(FS_PARTITION_NAME);
     if (!mtd_dev)
     {
-        rt_kprintf("Failed to create device.\n");
+        LOG_E("Failed to create device.\n");
     }
 #ifdef BSP_USING_ON_CHIP_FLASH_FATFS
     if (dfs_mount(FS_PARTITION_NAME, "/", "elm", 0, 0) == 0)
     {
-        rt_kprintf("Filesystem initialized!");
+        LOG_I("Filesystem initialized!");
     }
     else
     {
         dfs_mkfs("elm", FS_PARTITION_NAME);
         if (dfs_mount(FS_PARTITION_NAME, "/", "elm", 0, 0) != 0)
         {
-            rt_kprintf("Failed to initialize filesystem!");
+            LOG_E("Failed to initialize filesystem!");
         }
     }
-#endif
-#endif
+#endif /* BSP_USING_ON_CHIP_FLASH_FATFS */
+#endif /* BSP_USING_ON_CHIP_FLASH */
     return 0;
 }
 INIT_ENV_EXPORT(mnt_init);
-#endif
-
+#endif /* RT_USING_DFS */