解决没有选定FAL和littlefs软件包的问题,解决挂载顺序不合理的问题,重命名spiflash设备为spiflash0
This commit is contained in:
parent
1f13b6d58e
commit
963cce1e1b
|
@ -99,6 +99,9 @@ menu "Onboard Peripheral Drivers"
|
|||
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
|
||||
|
||||
|
|
|
@ -16,7 +16,6 @@
|
|||
#include <dfs_romfs.h>
|
||||
#include <dfs_fs.h>
|
||||
#include <dfs_posix.h>
|
||||
#include <fal.h>
|
||||
|
||||
#if DFS_FILESYSTEMS_MAX < 4
|
||||
#error "Please define DFS_FILESYSTEMS_MAX more than 4"
|
||||
|
@ -77,55 +76,34 @@ static int onboard_sdcard_mount(void)
|
|||
#endif
|
||||
|
||||
#ifdef BSP_USING_SPI_FLASH_LITTLEFS
|
||||
#include <fal.h>
|
||||
#define FS_PARTITION_NAME "spiflash0"
|
||||
|
||||
#define FS_PARTITION_NAME "filesystem"
|
||||
|
||||
static void spiflash_mount(void *parameter)
|
||||
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);
|
||||
}
|
||||
while (1)
|
||||
{
|
||||
rt_thread_mdelay(500);
|
||||
if(rt_device_find(FS_PARTITION_NAME) != RT_NULL)
|
||||
{
|
||||
if (dfs_mount(FS_PARTITION_NAME, "/flash", "lfs", 0, 0) == RT_EOK)
|
||||
{
|
||||
LOG_I("spi flash mount to '/flash'");
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG_W("spi flash mount to '/flash' failed!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int onboard_spiflash_mount(void)
|
||||
{
|
||||
rt_thread_t tid;
|
||||
|
||||
if (dfs_mount(FS_PARTITION_NAME, "/flash", "lfs", 0, 0) == RT_EOK)
|
||||
if (dfs_mount(FS_PARTITION_NAME, "/spiflash", "lfs", 0, 0) == RT_EOK)
|
||||
{
|
||||
LOG_I("spi flash mount to '/flash'");
|
||||
LOG_I("spi flash mount to '/spiflash'");
|
||||
}
|
||||
else
|
||||
{
|
||||
tid = rt_thread_create("spiflash_mount", spiflash_mount, RT_NULL,
|
||||
1024, RT_THREAD_PRIORITY_MAX - 3, 20);
|
||||
if (tid != RT_NULL)
|
||||
dfs_mkfs("lfs", FS_PARTITION_NAME);
|
||||
if (dfs_mount(FS_PARTITION_NAME, "/spiflash", "lfs", 0, 0) == RT_EOK)
|
||||
{
|
||||
rt_thread_startup(tid);
|
||||
LOG_I("spi flash mount to '/spiflash'");
|
||||
}
|
||||
else
|
||||
{
|
||||
LOG_E("create spiflash_mount thread err!");
|
||||
LOG_E("spi flash failed to mount to '/spiflash'");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -133,7 +111,6 @@ static int onboard_spiflash_mount(void)
|
|||
}
|
||||
#endif
|
||||
|
||||
|
||||
static const struct romfs_dirent _romfs_root[] =
|
||||
{
|
||||
#ifdef BSP_USING_SDCARD
|
||||
|
@ -141,7 +118,7 @@ static const struct romfs_dirent _romfs_root[] =
|
|||
#endif
|
||||
|
||||
#ifdef BSP_USING_SPI_FLASH_LITTLEFS
|
||||
{ROMFS_DIRENT_DIR, "flash", RT_NULL, 0},
|
||||
{ROMFS_DIRENT_DIR, "spiflash", RT_NULL, 0},
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
@ -52,7 +52,7 @@ extern const struct fal_flash_dev stm32_onchip_flash_128k;
|
|||
#ifdef BSP_USING_SPI_FLASH_LITTLEFS
|
||||
#define FAL_PART_TABLE \
|
||||
{ \
|
||||
{FAL_PART_MAGIC_WROD, "filesystem",FAL_USING_NOR_FLASH_DEV_NAME, 0 , 16 * 1024 * 1024, 0}, \
|
||||
{FAL_PART_MAGIC_WROD, "spiflash0", FAL_USING_NOR_FLASH_DEV_NAME, 0 , 16 * 1024 * 1024, 0}, \
|
||||
}
|
||||
#else
|
||||
#define FAL_PART_TABLE \
|
||||
|
|
Loading…
Reference in New Issue