From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8E6D9C433F5 for ; Thu, 7 Apr 2022 12:54:09 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 309C283DCC; Thu, 7 Apr 2022 14:54:07 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="h3LOSaXm"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BB2FD83DCD; Thu, 7 Apr 2022 14:54:04 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 30EFF83046 for ; Thu, 7 Apr 2022 14:54:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B143160CA5; Thu, 7 Apr 2022 12:54:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D089BC385A4; Thu, 7 Apr 2022 12:53:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649336040; bh=vBDvH8h9Cr0BgIHE9jHLYO/Nqq0VUkPfPTCnXTw3PQ0=; h=From:To:Cc:Subject:Date:From; b=h3LOSaXmtTFtjpCsbGe/Pc4vV3c31PkgioSVRGLhqpJj1/KlRdAh51hj4YcejC+TA gLefRXSYbzL8GYAUOsbfPI6pQ3jcd6eF5jju0XQOyYm8nZ1WEoH1fiSH3C9/RE9Udo Kd4SjKHvgWz6ls8aGpQm4G+2XQEqe8AN7E1cClzpzKRcueWHxUxU9frpb1ux1EJ8I7 8/MrAbOBov0vk7CNpGiqYNaTnsJuQTRuyr6WPkX+XjYfP8SvvZHLZxqwE7OX6Sx7hD MD1ynWKHZSfm12g10fNeuT78bT5Hmd5/oq2rkcwlpz7NP+k3iRCFPSifB5b77I/uWl 5I29COaxBZQYQ== Received: by pali.im (Postfix) id 52E3E7E4; Thu, 7 Apr 2022 14:53:57 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Simon Glass , Heinrich Schuchardt , Sean Anderson Cc: u-boot@lists.denx.de Subject: [PATCH] fs: Allow to compile FS_BTRFS when SPL is enabled Date: Thu, 7 Apr 2022 14:53:25 +0200 Message-Id: <20220407125325.5382-1-pali@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean 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 --- 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