diff --git a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig index d5686bd351..70e0c09762 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig +++ b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig @@ -76,7 +76,7 @@ menu "Onboard Peripheral Drivers" bool default n - config BSP_USING_SDCARD + config BSP_USING_SDCARD_FATFS bool "Enable SDCARD (FATFS)" select BSP_USING_SDIO select RT_USING_DFS @@ -91,6 +91,20 @@ menu "Onboard Peripheral Drivers" range 0 24000000 depends on BSP_USING_SDCARD default 1000000 + + config BSP_USING_SPI_FLASH_LITTLEFS + bool "Enable SPI-FLASH (LittleFS)" + select RT_USING_DFS + select RT_USING_DFS_ROMFS + select RT_USING_MTD_NOR + select BSP_USING_SPI_FLASH + select BSP_USING_FS + select PKG_USING_FAL + select FAL_USING_SFUD_PORT + select PKG_USING_LITTLEFS + select RT_USING_SYSTEM_WORKQUEUE + default n + endmenu endmenu diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_filesystem.c b/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_filesystem.c index a8b36da2e1..529b1e1157 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_filesystem.c +++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/drv_filesystem.c @@ -28,7 +28,7 @@ #define DBG_LVL DBG_INFO #include -#ifdef BSP_USING_SDCARD +#ifdef BSP_USING_SDCARD_FATFS static void sd_mount(void *parameter) { while (1) @@ -75,12 +75,52 @@ static int onboard_sdcard_mount(void) } #endif +#ifdef BSP_USING_SPI_FLASH_LITTLEFS +#include +#define FS_PARTITION_NAME "spiflash0" + +static int onboard_spiflash_mount(void) +{ + struct rt_device *mtd_dev = RT_NULL; + + fal_init(); + + mtd_dev = fal_mtd_nor_device_create(FS_PARTITION_NAME); + if (!mtd_dev) + { + LOG_E("Can't create a mtd device on '%s' partition.", FS_PARTITION_NAME); + } + + if (dfs_mount(FS_PARTITION_NAME, "/spiflash", "lfs", 0, 0) == RT_EOK) + { + LOG_I("spi flash mount to '/spiflash'"); + } + else + { + dfs_mkfs("lfs", FS_PARTITION_NAME); + if (dfs_mount(FS_PARTITION_NAME, "/spiflash", "lfs", 0, 0) == RT_EOK) + { + LOG_I("spi flash mount to '/spiflash'"); + } + else + { + LOG_E("spi flash failed to mount to '/spiflash'"); + } + } + + return RT_EOK; +} +#endif + static const struct romfs_dirent _romfs_root[] = { -#ifdef BSP_USING_SDCARD +#ifdef BSP_USING_SDCARD_FATFS {ROMFS_DIRENT_DIR, "sdcard", RT_NULL, 0}, #endif -// {ROMFS_DIRENT_DIR, "flash", RT_NULL, 0}, + +#ifdef BSP_USING_SPI_FLASH_LITTLEFS + {ROMFS_DIRENT_DIR, "spiflash", RT_NULL, 0}, +#endif }; const struct romfs_dirent romfs_root = @@ -94,10 +134,14 @@ static int filesystem_mount(void) { LOG_E("rom mount to '/' failed!"); } -#ifdef BSP_USING_SDCARD +#ifdef BSP_USING_SDCARD_FATFS onboard_sdcard_mount(); #endif +#ifdef BSP_USING_SPI_FLASH_LITTLEFS + onboard_spiflash_mount(); +#endif + return RT_EOK; } INIT_APP_EXPORT(filesystem_mount); diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/fal_cfg.h b/bsp/stm32/stm32f407-atk-explorer/board/ports/fal_cfg.h index 995136cd54..304efe869d 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/ports/fal_cfg.h +++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/fal_cfg.h @@ -14,10 +14,12 @@ #include #include +#ifdef BSP_USING_SPI_FLASH_LITTLEFS +extern struct fal_flash_dev nor_flash0; +#else #define FLASH_SIZE_GRANULARITY_16K (4 * 16 * 1024) #define FLASH_SIZE_GRANULARITY_64K (64 * 1024) #define FLASH_SIZE_GRANULARITY_128K (7 * 128 * 1024) - #define STM32_FLASH_START_ADRESS_16K STM32_FLASH_START_ADRESS #define STM32_FLASH_START_ADRESS_64K (STM32_FLASH_START_ADRESS_16K + FLASH_SIZE_GRANULARITY_16K) #define STM32_FLASH_START_ADRESS_128K (STM32_FLASH_START_ADRESS_64K + FLASH_SIZE_GRANULARITY_64K) @@ -25,24 +27,40 @@ extern const struct fal_flash_dev stm32_onchip_flash_16k; extern const struct fal_flash_dev stm32_onchip_flash_64k; extern const struct fal_flash_dev stm32_onchip_flash_128k; +#endif + /* flash device table */ +#ifdef BSP_USING_SPI_FLASH_LITTLEFS +#define FAL_FLASH_DEV_TABLE \ +{ \ + &nor_flash0, \ +} +#else #define FAL_FLASH_DEV_TABLE \ { \ &stm32_onchip_flash_16k, \ &stm32_onchip_flash_64k, \ &stm32_onchip_flash_128k, \ } +#endif + /* ====================== Partition Configuration ========================== */ #ifdef FAL_PART_HAS_TABLE_CFG /* partition table */ +#ifdef BSP_USING_SPI_FLASH_LITTLEFS +#define FAL_PART_TABLE \ +{ \ + {FAL_PART_MAGIC_WROD, "spiflash0", FAL_USING_NOR_FLASH_DEV_NAME, 0 , 16 * 1024 * 1024, 0}, \ +} +#else #define FAL_PART_TABLE \ { \ {FAL_PART_MAGIC_WROD, "bootloader", "onchip_flash_16k", 0 , FLASH_SIZE_GRANULARITY_16K , 0}, \ {FAL_PART_MAGIC_WROD, "param", "onchip_flash_64k", 0 , FLASH_SIZE_GRANULARITY_64K , 0}, \ {FAL_PART_MAGIC_WROD, "app", "onchip_flash_128k", 0 , FLASH_SIZE_GRANULARITY_128K, 0}, \ } - +#endif #endif /* FAL_PART_HAS_TABLE_CFG */ #endif /* _FAL_CFG_H_ */ diff --git a/bsp/stm32/stm32f407-atk-explorer/board/ports/spi_flash_init.c b/bsp/stm32/stm32f407-atk-explorer/board/ports/spi_flash_init.c index b92344fa43..b5e8571cd5 100644 --- a/bsp/stm32/stm32f407-atk-explorer/board/ports/spi_flash_init.c +++ b/bsp/stm32/stm32f407-atk-explorer/board/ports/spi_flash_init.c @@ -14,12 +14,19 @@ #include "drv_spi.h" #if defined(BSP_USING_SPI_FLASH) + +#ifdef FAL_USING_NOR_FLASH_DEV_NAME +#define _SPI_FLASH_NAME FAL_USING_NOR_FLASH_DEV_NAME +#else +#define _SPI_FLASH_NAME "W25Q128" +#endif + static int rt_hw_spi_flash_init(void) { __HAL_RCC_GPIOB_CLK_ENABLE(); rt_hw_spi_device_attach("spi1", "spi10", GPIOB, GPIO_PIN_14); - if (RT_NULL == rt_sfud_flash_probe("W25Q128", "spi10")) + if (RT_NULL == rt_sfud_flash_probe(_SPI_FLASH_NAME, "spi10")) { return -RT_ERROR; };