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 C58E8C433EF for ; Tue, 5 Apr 2022 13:49:50 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CAE9483B49; Tue, 5 Apr 2022 15:49:48 +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="qzkIDGWo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DBA3983B10; Tue, 5 Apr 2022 15:49:46 +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 6C5DF83B4C for ; Tue, 5 Apr 2022 15:49:44 +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 42301614FB; Tue, 5 Apr 2022 13:49:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83B2CC385A1; Tue, 5 Apr 2022 13:49:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649166582; bh=RvJm2ZO/MMsFVahBBDHJPwvh6Qs2zVybpstPDxHHiLI=; h=From:To:Cc:Subject:Date:From; b=qzkIDGWotPHLrFa60PoEdxAeQrFN23JvHXXRTcG6FJl1Ijf2XjeYytqd8SQb//QFe vPb8Lhtph5j2NizjCLoV3fck915VglyQvDY6xJo3BShAdajs+SXJhkITWssKyfA6fH rBJvGAJ/qx1RXaH9aboc3sWPJ+7QPExGFm1TNiNWHbDom16VUx+lFZi8V1gUe8D3Ne qg0lvqWAbHjVFgFTx/oqWS3VbVm5LBHPmML8n6yqfIv//WQiEiGfXhvorBOGis35j+ fNZ4mukEJAMGMso+oZAwPvsB4sGoPQZAfaxydr5rWdGi1mtFh5zWBcrIBngINE3P28 BaOyHyaTfmMNA== Received: by pali.im (Postfix) id 6919C7B2; Tue, 5 Apr 2022 15:49:40 +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 CMD_UBIFS when SPL is enabled Date: Tue, 5 Apr 2022 15:49:24 +0200 Message-Id: <20220405134924.1605-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 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(+) diff --git a/fs/fs.c b/fs/fs.c index 5c3b1ac09e53..7bf8c440886a 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -246,6 +246,7 @@ static struct fstype_info fstypes[] = { .ln = fs_ln_unsupported, }, #endif +#ifndef CONFIG_SPL_BUILD #ifdef CONFIG_CMD_UBIFS { .fstype = FS_TYPE_UBIFS, @@ -265,6 +266,7 @@ static struct fstype_info fstypes[] = { .ln = fs_ln_unsupported, }, #endif +#endif #ifdef CONFIG_FS_BTRFS { .fstype = FS_TYPE_BTRFS, -- 2.20.1