summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2025-10-01 14:31:03 -0600
committerTom Rini <[email protected]>2025-10-10 14:25:35 -0600
commit42b353412517ecfc9ba93dcd7f31e0e3557af413 (patch)
treeda5a49bf83f38a75045781fb7998641672341305 /fs
parentdde1515be5e2f6fdf3429b0d6d5ad6fa80e7715e (diff)
fs: Rework filesystem guards for xPL phases
When adding filesystems to the table in fs/fs.c we need to use CONFIG_IS_ENABLED(FS_xxx) so that we only include references to a given filesystem when CONFIG_FS_xxx or CONFIG_SPL_FS_xxx or similar are enabled. Update the filesystems which weren't doing this to follow that pattern. Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'fs')
-rw-r--r--fs/fs.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/fs.c b/fs/fs.c
index 2650328b358..c7706d9af85 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -316,8 +316,7 @@ static struct fstype_info fstypes[] = {
},
#endif
#endif
-#ifndef CONFIG_XPL_BUILD
-#ifdef CONFIG_FS_BTRFS
+#if CONFIG_IS_ENABLED(FS_BTRFS)
{
.fstype = FS_TYPE_BTRFS,
.name = "btrfs",
@@ -337,7 +336,6 @@ static struct fstype_info fstypes[] = {
.rename = fs_rename_unsupported,
},
#endif
-#endif
#if CONFIG_IS_ENABLED(FS_SQUASHFS)
{
.fstype = FS_TYPE_SQUASHFS,
@@ -360,7 +358,7 @@ static struct fstype_info fstypes[] = {
.rename = fs_rename_unsupported,
},
#endif
-#if IS_ENABLED(CONFIG_FS_EROFS)
+#if CONFIG_IS_ENABLED(FS_EROFS)
{
.fstype = FS_TYPE_EROFS,
.name = "erofs",
@@ -382,7 +380,7 @@ static struct fstype_info fstypes[] = {
.rename = fs_rename_unsupported,
},
#endif
-#if IS_ENABLED(CONFIG_FS_EXFAT)
+#if CONFIG_IS_ENABLED(FS_EXFAT)
{
.fstype = FS_TYPE_EXFAT,
.name = "exfat",