[PATCH] fs: Allow to compile FS_BTRFS when SPL is enabled

[PATCH] fs: Allow to compile FS_BTRFS when SPL is enabled

[Pali Rohár]

Currently there is no btrfs support in SPL. But macro CONFIG_FS_BTRFS is
defined also when building SPL. When both FS_BTRFS and SPL are enabled
then build process throw compile error.

Fix check for btrfs code in fstypes[] to allow compiling FS_BTRFS only in
proper U-Boot.

Signed-off-by: Pali Rohár <pali@kernel.org>
---
 fs/fs.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fs/fs.c b/fs/fs.c
index b4306cf8499e..100a2a63810a 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -267,6 +267,7 @@ static struct fstype_info fstypes[] = {
 	},
 #endif
 #endif
+#ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_FS_BTRFS
 	{
 		.fstype = FS_TYPE_BTRFS,
@@ -286,6 +287,7 @@ static struct fstype_info fstypes[] = {
 		.ln = fs_ln_unsupported,
 	},
 #endif
+#endif
 #if CONFIG_IS_ENABLED(FS_SQUASHFS)
 	{
 		.fstype = FS_TYPE_SQUASHFS,
-- 
2.20.1

Re: [PATCH] fs: Allow to compile FS_BTRFS when SPL is enabled

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 455 bytes --]

On Thu, Apr 07, 2022 at 02:53:25PM +0200, Pali Rohár wrote:

> Currently there is no btrfs support in SPL. But macro CONFIG_FS_BTRFS is
> defined also when building SPL. When both FS_BTRFS and SPL are enabled
> then build process throw compile error.
> 
> Fix check for btrfs code in fstypes[] to allow compiling FS_BTRFS only in
> proper U-Boot.
> 
> Signed-off-by: Pali Rohár <pali@kernel.org>

Applied to u-boot/master, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]