Merge pull request #106 from whj4674672/master

【完善】使能 spi flash 挂载文件系统

Author: Guozhanxin

libraries/Kconfig

@@ -91,12 +91,20 @@ menu "Onboard Peripheral"
         select BSP_USING_UART4
         default n
 
+    config BSP_USING_SPI_FLASH
+        bool "Enable SPI FLASH (spi1)"
+        select BSP_USING_SPI
+        select BSP_USING_SPI1
+        select PKG_USING_FAL
+        select FAL_USING_SFUD_PORT
+        select RT_USING_SFUD
+        default n
+        
     config BSP_USING_WIFI
         bool "Enable wifi (AP6212)"
         select ART_PI_USING_WIFI_6212_LIB
         select ART_PI_USING_OTA_LIB
-        select BSP_USING_SPI
-        select BSP_USING_SPI1
+        select BSP_USING_SPI_FLASH
         select RT_USING_WIFI
         select RT_USING_SAL
         default n
@@ -122,11 +130,9 @@ menu "Onboard Peripheral"
                 default n
             config BSP_USING_SPI_FLASH_FS
                 bool "Enable SPI FLASH filesystem"
-                select BSP_USING_SPI
-                select BSP_USING_SPI1
-                select PKG_USING_FAL
-                select FAL_USING_SFUD_PORT
-                select RT_USING_SFUD
+                select BSP_USING_SPI_FLASH
+                select RT_USING_MTD_NOR
+                select PKG_USING_LITTLEFS
                 default n
         endif
 

libraries/drivers/SConscript

@@ -49,6 +49,9 @@ if GetDepend(['BSP_USING_USBH']):
 if GetDepend(['RT_USING_CAN']):
     src += ['drv_fdcan.c']
 
+if GetDepend(['BSP_USING_SPI_FLASH']):
+    src += ['drv_spi_flash.c']
+	
 path = [cwd]
 path += [cwd + '/include']
 path += [cwd + '/include/config']

libraries/drivers/drv_spi_flash.c

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2006-2018, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author       Notes
+ * 2020-11-07     wanghaijing  the first version
+ */
+
+#include <rtthread.h>
+#include <rtdevice.h>
+#include <spi_flash.h>
+#include <drv_spi.h>
+
+static int rt_flash_init(void)
+{
+    extern rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const char *spi_dev_name);
+    extern int fal_init(void);
+
+    rt_hw_spi_device_attach("spi1", "spi10", GPIOA, GPIO_PIN_4);
+
+    /* initialize SPI Flash device */
+    rt_sfud_flash_probe("norflash0", "spi10");
+
+    fal_init();
+
+    return 0;
+}
+INIT_ENV_EXPORT(rt_flash_init);

libraries/rt_ota_lib/src/rtota_update.c

@@ -7,6 +7,7 @@
  * Date           Author       Notes
  * 2018-01-30     armink       the first version
  * 2018-08-27     Murphy       update log
+ * 2020-11-07     wanghaijing  remove initialize SPI Flash
  */
 
 #include <rtthread.h>
@@ -35,24 +36,6 @@
 
 char *partition_name;
 
-static int rt_flash_init(void)
-{
-#include <spi_flash.h>
-#include <drv_spi.h>
-    extern rt_spi_flash_device_t rt_sfud_flash_probe(const char *spi_flash_dev_name, const char *spi_dev_name);
-    extern int fal_init(void);
-
-    rt_hw_spi_device_attach("spi1", "spi10", GPIOA, GPIO_PIN_4);
-
-    /* initialize SPI Flash device */
-    rt_sfud_flash_probe("norflash0", "spi10");
-
-    fal_init();
-
-    return 0;
-}
-INIT_ENV_EXPORT(rt_flash_init);
-
 static size_t update_file_total_size, update_file_cur_size;
 static const struct fal_partition * dl_part = RT_NULL;
 static enum rym_code ymodem_on_begin(struct rym_ctx *ctx, rt_uint8_t *buf, rt_size_t len)

projects/art_pi_blink_led/.config

@@ -114,9 +114,9 @@ CONFIG_FINSH_ARG_MAX=10
 #
 CONFIG_RT_USING_DFS=y
 CONFIG_DFS_USING_WORKDIR=y
-CONFIG_DFS_FILESYSTEMS_MAX=2
-CONFIG_DFS_FILESYSTEM_TYPES_MAX=2
-CONFIG_DFS_FD_MAX=16
+CONFIG_DFS_FILESYSTEMS_MAX=6
+CONFIG_DFS_FILESYSTEM_TYPES_MAX=6
+CONFIG_DFS_FD_MAX=32
 # CONFIG_RT_USING_DFS_MNTTABLE is not set
 # CONFIG_RT_USING_DFS_ELMFAT is not set
 CONFIG_RT_USING_DFS_DEVFS=y

projects/art_pi_blink_led/board/port/filesystem.c

@@ -12,10 +12,6 @@
 #include <rtthread.h>
 
 #ifdef BSP_USING_FS
-
-#if RT_DFS_ELM_MAX_SECTOR_SIZE < 4096
-#error "Please define RT_DFS_ELM_MAX_SECTOR_SIZE more than 4096"
-#endif
 #if DFS_FILESYSTEMS_MAX < 4
 #error "Please define DFS_FILESYSTEMS_MAX more than 4"
 #endif
@@ -158,8 +154,8 @@ int mount_init(void)
     {
         LOG_E("create sd_mount thread err!");
     }
-    return RT_EOK;
 #endif
+    return RT_EOK;
 }
 INIT_APP_EXPORT(mount_init);