From 4f3a25b7472aeef93430955c9f6471dc2584d082 Mon Sep 17 00:00:00 2001 From: Joakim Andersson Date: Mon, 14 Jul 2025 15:31:51 +0200 Subject: [PATCH] fs: shell: Fix FS shell using fixed storage_partition name instead of DT Fix FS shell using fixed 'storage_partition' nodelabel instead of accessing the DT defined partition from the zephyr,fstab,littlefs node partition property. Signed-off-by: Joakim Andersson --- subsys/fs/shell.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/subsys/fs/shell.c b/subsys/fs/shell.c index 5ef7b16d4fc78..75a87ba62cf3c 100644 --- a/subsys/fs/shell.c +++ b/subsys/fs/shell.c @@ -17,9 +17,6 @@ #include #include -#define STORAGE_PARTITION storage_partition -#define STORAGE_PARTITION_ID FIXED_PARTITION_ID(STORAGE_PARTITION) - #ifdef CONFIG_FILE_SYSTEM_SHELL_MOUNT_COMMAND /* FAT */ #ifdef CONFIG_FAT_FILESYSTEM_ELM @@ -65,6 +62,15 @@ static struct fs_mount_t littlefs_mnt = { #else #include +#define STORAGE_PARTIION_NODE_ID DT_PHANDLE(DT_INST(0, zephyr_fstab_littlefs), partition) + +#if DT_FIXED_PARTITION_EXISTS(STORAGE_PARTIION_NODE_ID) +#define STORAGE_PARTITION_ID DT_FIXED_PARTITION_ID(STORAGE_PARTIION_NODE_ID) +#else +#define STORAGE_PARTITION storage_partition +#define STORAGE_PARTITION_ID FIXED_PARTITION_ID(STORAGE_PARTITION) +#endif + FS_LITTLEFS_DECLARE_DEFAULT_CONFIG(lfs_data); static struct fs_mount_t littlefs_mnt = { .type = FS_LITTLEFS,