From: Pali Rohár <pali@kernel.org>
Date: Thu, 7 Apr 2022 12:53:25 +0000 (+0200)
Subject: fs: Allow to compile FS_BTRFS when SPL is enabled
X-Git-Tag: v2022.07-rc1~18^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8a79164674230f401f696f7eb09315ad02199b5;p=pandora-u-boot.git

fs: Allow to compile FS_BTRFS when SPL is enabled

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>
---

diff --git a/fs/fs.c b/fs/fs.c
index c67a1c7876a..97d47916f38 100644
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -288,6 +288,7 @@ static struct fstype_info fstypes[] = {
 	},
 #endif
 #endif
+#ifndef CONFIG_SPL_BUILD
 #ifdef CONFIG_FS_BTRFS
 	{
 		.fstype = FS_TYPE_BTRFS,
@@ -307,6 +308,7 @@ static struct fstype_info fstypes[] = {
 		.ln = fs_ln_unsupported,
 	},
 #endif
+#endif
 #if IS_ENABLED(CONFIG_FS_SQUASHFS)
 	{
 		.fstype = FS_TYPE_SQUASHFS,