mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
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 <trini@konsulko.com>
This commit is contained in:
8
fs/fs.c
8
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",
|
||||
|
||||
Reference in New Issue
Block a user