diff --git a/bsp/stm32/stm32f407-atk-explorer/board/Kconfig b/bsp/stm32/stm32f407-atk-explorer/board/Kconfig index 8690baf1778428fcf594692adad97ebeb0707517..70e0c0976207254f216d9f097743c322a8d44c1d 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 @@ -93,7 +93,7 @@ menu "Onboard Peripheral Drivers" default 1000000 config BSP_USING_SPI_FLASH_LITTLEFS - bool "Enable LITTLEFS" + bool "Enable SPI-FLASH (LittleFS)" select RT_USING_DFS select RT_USING_DFS_ROMFS select RT_USING_MTD_NOR 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 82f9c9c76b881fc02d7af735f93cde76508f4ba4..529b1e1157908842458e231bb22bb83c90b51318 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) @@ -84,6 +84,7 @@ 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) { @@ -113,7 +114,7 @@ static int onboard_spiflash_mount(void) static const struct romfs_dirent _romfs_root[] = { -#ifdef BSP_USING_SDCARD +#ifdef BSP_USING_SDCARD_FATFS {ROMFS_DIRENT_DIR, "sdcard", RT_NULL, 0}, #endif @@ -133,7 +134,7 @@ static int filesystem_mount(void) { LOG_E("rom mount to '/' failed!"); } -#ifdef BSP_USING_SDCARD +#ifdef BSP_USING_SDCARD_FATFS onboard_sdcard_mount(); #endif 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 b92344fa43aedf095717d0aa0b2c9a323526b5bf..b5e8571cd53c8a2d0a3ff3041832eab5cef3f7e2 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; };