From 5bbaba6e29fc0d92ff0201bd7066c021a6dd8727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Tue, 5 Apr 2022 15:48:32 +0200 Subject: fs: Allow to compile FS_FAT only for proper U-Boot MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CONFIG_SPL_FS_FAT cannot be disabled when CONFIG_FS_FAT is enabled. Fix it. Signed-off-by: Pali Rohár --- fs/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fs/fs.c') diff --git a/fs/fs.c b/fs/fs.c index c3a2ed97541..2b0a242e8c7 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -177,7 +177,7 @@ struct fstype_info { }; static struct fstype_info fstypes[] = { -#ifdef CONFIG_FS_FAT +#if CONFIG_IS_ENABLED(FS_FAT) { .fstype = FS_TYPE_FAT, .name = "fat", -- cgit v1.2.3 From b8617df6d5c8afb74ae8bb4b732a8b56b4f5e9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Tue, 5 Apr 2022 15:49:24 +0200 Subject: fs: Allow to compile CMD_UBIFS when SPL is enabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently there is no UBIFS support in SPL. But macro CONFIG_CMD_UBIFS is defined also when building SPL. when both CMD_UBIFS and SPL are enabled then build process throw compile error. Fix check for ubifs code in fstypes[] to allow compiling CMD_UBIFS only in proper U-Boot. Signed-off-by: Pali Rohár --- fs/fs.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'fs/fs.c') diff --git a/fs/fs.c b/fs/fs.c index 2b0a242e8c7..c67a1c7876a 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -267,6 +267,7 @@ static struct fstype_info fstypes[] = { .ln = fs_ln_unsupported, }, #endif +#ifndef CONFIG_SPL_BUILD #ifdef CONFIG_CMD_UBIFS { .fstype = FS_TYPE_UBIFS, @@ -286,6 +287,7 @@ static struct fstype_info fstypes[] = { .ln = fs_ln_unsupported, }, #endif +#endif #ifdef CONFIG_FS_BTRFS { .fstype = FS_TYPE_BTRFS, -- cgit v1.2.3