添加romfs，对sd和nor，启动装载在不同目录

f407/applications/fs.c

@@ -4,6 +4,7 @@
 #include <rtdevice.h>
 #include <rtthread.h>
 #include <dfs_posix.h>
+#include <dfs_romfs.h>
 #include "datadef.h"
 #include "fal.h"
 #include "fs.h"
@@ -15,8 +16,15 @@
 #define FREE     free
 
 
-#define FS_TYPE   "elm"
-//#define FS_TYPE   "lfs"
+static const struct romfs_dirent _romfs_root[] =
+{
+    {ROMFS_DIRENT_DIR, SD_DEV,  RT_NULL, 0},
+    {ROMFS_DIRENT_DIR, NOR_DEV, RT_NULL, 0},
+};
+static const struct romfs_dirent romfs_root =
+{
+    ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_romfs_root, sizeof(_romfs_root) / sizeof(_romfs_root[0])
+};
 
 typedef struct {
     uint8_t  mounted[FS_DEV_MAX];
@@ -225,6 +233,8 @@ int fs_mkdir(char *path)
 
 int fs_init(void)
 {
+    dfs_mount(NULL, "/", "rom", 0, &(romfs_root));
+    
     sd_mount();
     nor_mount();
     return 0;

f407/applications/rtconfig.h

@@ -124,7 +124,7 @@
 #define RT_USING_SFUD
 #define RT_SFUD_USING_SFDP
 #define RT_SFUD_USING_FLASH_INFO_TABLE
-#//define RT_SFUD_SPI_MAX_HZ 50000000
+#//define RT_SFUD_SPI_MAX_HZ (40*1000000)
 #define RT_USING_I2C
 #define RT_USING_I2C_BITOPS
 #define RT_USING_PIN
@@ -241,7 +241,7 @@
 #define RT_DFS_ELM_REENTRANT
 #define RT_DFS_ELM_MUTEX_TIMEOUT 3000
 #define RT_USING_DFS_DEVFS
-//#define RT_USING_DFS_ROMFS
+#define RT_USING_DFS_ROMFS
 
 #if 1
 #define RT_USING_PTHREADS

f407/project/app/app.uvoptx

@@ -117,11 +117,6 @@
         <pMon>Segger\JL2CM3.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
-        <SetRegEntry>
-          <Number>0</Number>
-          <Key>DLGUARM</Key>
-          <Name>
-</Name>        </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>ARMRTXEVENTFLAGS</Key>
@@ -248,7 +243,7 @@
 
   <Group>
     <GroupName>applications</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -2820,7 +2815,7 @@
 
   <Group>
     <GroupName>drivers/drv</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -4696,7 +4691,7 @@
 
   <Group>
     <GroupName>rt-thread/comp/drivers</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -5224,7 +5219,7 @@
 
   <Group>
     <GroupName>rt-thread/comp/dfs</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -5372,6 +5367,30 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>20</GroupNumber>
+      <FileNumber>415</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\rt-thread\components\dfs\dfs_v2\filesystems\romfs\dfs_romfs.c</PathWithFileName>
+      <FilenameWithoutPath>dfs_romfs.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>20</GroupNumber>
+      <FileNumber>416</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\rt-thread\components\dfs\dfs_v2\filesystems\romfs\romfs.c</PathWithFileName>
+      <FilenameWithoutPath>romfs.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -5382,7 +5401,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>21</GroupNumber>
-      <FileNumber>415</FileNumber>
+      <FileNumber>417</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -5396,13 +5415,13 @@
 
   <Group>
     <GroupName>rt-thread/comp/fal</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>22</GroupNumber>
-      <FileNumber>416</FileNumber>
+      <FileNumber>418</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -5414,7 +5433,7 @@
     </File>
     <File>
       <GroupNumber>22</GroupNumber>
-      <FileNumber>417</FileNumber>
+      <FileNumber>419</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -5426,7 +5445,7 @@
     </File>
     <File>
       <GroupNumber>22</GroupNumber>
-      <FileNumber>418</FileNumber>
+      <FileNumber>420</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -5438,7 +5457,7 @@
     </File>
     <File>
       <GroupNumber>22</GroupNumber>
-      <FileNumber>419</FileNumber>
+      <FileNumber>421</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -5450,7 +5469,7 @@
     </File>
     <File>
       <GroupNumber>22</GroupNumber>
-      <FileNumber>420</FileNumber>
+      <FileNumber>422</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>

f407/rt-thread/components/fal/samples/porting/fal_cfg.h

@@ -29,7 +29,6 @@ extern struct fal_flash_dev nor_flash0;
 /* partition table */
 #define FAL_PART_TABLE                                                \
 {                                                                     \
-    {FAL_PART_MAGIC_WORD, "nor", FAL_FLASH_DEV_NAME,  0,    1*MB, 0}, \
     {FAL_PART_MAGIC_WORD, "nor", FAL_FLASH_DEV_NAME,  1*MB, 3*MB, 0}, \
 }
 #endif /* FAL_PART_HAS_TABLE_CFG */