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 6CBE5C433EF for ; Wed, 6 Apr 2022 21:34:19 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ED49683D2A; Wed, 6 Apr 2022 23:34:16 +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="Hy+2UT+n"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6B46583E42; Wed, 6 Apr 2022 23:34:14 +0200 (CEST) Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::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 091E983515 for ; Wed, 6 Apr 2022 23:34:12 +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 ams.source.kernel.org (Postfix) with ESMTPS id ABE3EB825B2; Wed, 6 Apr 2022 21:34:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37174C385A3; Wed, 6 Apr 2022 21:34:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1649280850; bh=QKEWhcS98yNUZcev87kd/IiO9OGDUqDSaCQC1LttJHI=; h=From:To:Cc:Subject:Date:From; b=Hy+2UT+nA4aVM/c3XTPjs4XsA01KSuZAk5KxwjPTf2p9yjfayzu30yFSdwI6+qoKR BHbj5cUSHRv0WFDFCbH5GmH4N1fu6jTE/EUtuRY+gNL3lBXEfhzopM4tQph+IDW96Z c2xvY9uLMiuCAwVH4w7e7F9g1SNHgzMnXyrtO5B70EXE5+VpOuCjsxsMHBImZBAvnu /Xj1g5JsnaLdvStZD1CCh2MWb4yW2iieFCeF75mYYYnmGhcRRZe+Oo9NsUo3cfBiof 7OkjInPGid4tvGUg0uuQqkX0CjrzrEQOggB9JaU57J6FQ4SAeuHIlMcZ2zc+edcrWZ ZcftB3WyF0vqA== Received: by pali.im (Postfix) id 999A3775; Wed, 6 Apr 2022 23:34:07 +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_SQUASHFS only for proper U-Boot Date: Wed, 6 Apr 2022 23:34:00 +0200 Message-Id: <20220406213400.30857-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 CONFIG_SPL_FS_SQUASHFS cannot be disabled when CONFIG_FS_SQUASHFS is enabled. Fix it. Signed-off-by: Pali Rohár --- fs/fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/fs.c b/fs/fs.c index 7bf8c440886a..b4306cf8499e 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -286,7 +286,7 @@ static struct fstype_info fstypes[] = { .ln = fs_ln_unsupported, }, #endif -#if IS_ENABLED(CONFIG_FS_SQUASHFS) +#if CONFIG_IS_ENABLED(FS_SQUASHFS) { .fstype = FS_TYPE_SQUASHFS, .name = "squashfs", -- 2.20.1