From 151ca3a31f472d05dfe4eb711a94ac8f4c786da5 Mon Sep 17 00:00:00 2001 From: Xudong Zheng <7pkvm5aw@slicealias.com> Date: Fri, 17 Jan 2025 16:52:50 -0500 Subject: [PATCH] fs: littlefs: define default disk version in Kconfig This makes it possible to set the disk version when Devicetree is not used for configuration. Signed-off-by: Xudong Zheng <7pkvm5aw@slicealias.com> --- subsys/fs/Kconfig.littlefs | 7 +++++++ subsys/fs/littlefs_fs.c | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/subsys/fs/Kconfig.littlefs b/subsys/fs/Kconfig.littlefs index b7e1c4bf8d4..72de8279c1a 100644 --- a/subsys/fs/Kconfig.littlefs +++ b/subsys/fs/Kconfig.littlefs @@ -125,4 +125,11 @@ config FS_LITTLEFS_DISK_VERSION to maintain backward compatibility with existing littlefs with the same major disk version. +config FS_LITTLEFS_DISK_VERSION_NUMBER + hex "Default littlefs disk version" + default 0 + depends on FS_LITTLEFS_DISK_VERSION + help + Set to 0 to use the latest littlefs disk version (LFS_DISK_VERSION). + endif # FILE_SYSTEM_LITTLEFS diff --git a/subsys/fs/littlefs_fs.c b/subsys/fs/littlefs_fs.c index 7cd05d5be33..7cf8aaa44c7 100644 --- a/subsys/fs/littlefs_fs.c +++ b/subsys/fs/littlefs_fs.c @@ -793,7 +793,10 @@ static int littlefs_init_cfg(struct fs_littlefs *fs, int flags) uint32_t disk_version = lcp->disk_version; if (disk_version == 0) { - disk_version = LFS_DISK_VERSION; + disk_version = CONFIG_FS_LITTLEFS_DISK_VERSION_NUMBER; + if (disk_version == 0) { + disk_version = LFS_DISK_VERSION; + } } #endif /* CONFIG_FS_LITTLEFS_DISK_VERSION */