From patchwork Sun Mar 31 02:37:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1918153 X-Patchwork-Delegate: andre.przywara@arm.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=shDwcmYN; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V6dbS2bL3z1yYR for ; Sun, 31 Mar 2024 13:37:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 70E3887F4B; Sun, 31 Mar 2024 04:37:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com 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=canonical.com header.i=@canonical.com header.b="shDwcmYN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C9BCC87ECC; Sun, 31 Mar 2024 04:37:22 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 100D287F3A for ; Sun, 31 Mar 2024 04:37:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=heinrich.schuchardt@canonical.com Received: from LT2ubnt.fritz.box (ip-062-143-245-032.um16.pools.vodafone-ip.de [62.143.245.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id 6033140100; Sun, 31 Mar 2024 02:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1711852640; bh=NJYm+voDDfzoHlLkPwrj7r6HjjMBGLmoY86DlNoFrio=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=shDwcmYN3cBI4M7Ca5+rn3yIFS+sixw+GI3e03INFZpOH3xNnFXDFLC8W9O60eJlL 9auC7OzS71sZ/EYm7k3KJpOOmBGSOKFVG80m8rP/qNjuVkzhmitnf8KtK27kwom2dA xxyF3YCEDqy45lYxr0246TGtJmYkYZmYoWwPJYShfN86x8RNK2JhOQF5DTn9yjzlhe J9YxPfddOdo4EJ6YmWq4URTvXGx6kZtWv1ihFXUe/bceJ/ZPrXpMi94FInbsz1IJD8 WNzVoO7hoej87MYDm4C6s9A3goNUrDnqrKv87gPiJdeF2UQhWd4IldYKSc2p1pMlz5 3uowPWGNVkOSg== From: Heinrich Schuchardt To: Jagan Teki , Andre Przywara Cc: Hans de Goede , Tom Rini , Samuel Holland , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 1/2] env: ENV_IS_IN_EXT4 should enable SYS_MMC_ENV_DEV Date: Sun, 31 Mar 2024 04:37:16 +0200 Message-ID: <20240331023718.52064-2-heinrich.schuchardt@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240331023718.52064-1-heinrich.schuchardt@canonical.com> References: <20240331023718.52064-1-heinrich.schuchardt@canonical.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean When enabling CONFIG_ENV_IS_IN_EXT4 the environment might be stored on an mmc device similar to the CONFIG_ENV_IS_IN_FAT case. Fixes: 7d080773347c ("Convert CONFIG_SYS_MMC_ENV_DEV et al to Kconfig") Signed-off-by: Heinrich Schuchardt --- env/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/env/Kconfig b/env/Kconfig index 7885c8bf831..b87d8f8dea8 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -655,7 +655,7 @@ config SYS_RELOC_GD_ENV_ADDR config SYS_MMC_ENV_DEV int "mmc device number" - depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || \ + depends on ENV_IS_IN_MMC || ENV_IS_IN_FAT || ENV_IS_IN_EXT4 || \ CMD_MVEBU_BUBT || FMAN_ENET || QE || PHY_CORTINA default 0 help From patchwork Sun Mar 31 02:37:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 1918154 X-Patchwork-Delegate: andre.przywara@arm.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=EwVrBOjU; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V6dbd5BvXz1yYR for ; Sun, 31 Mar 2024 13:37:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 817BF882A1; Sun, 31 Mar 2024 04:37:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com 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=canonical.com header.i=@canonical.com header.b="EwVrBOjU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5699287FA0; Sun, 31 Mar 2024 04:37:24 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E29EC87F41 for ; Sun, 31 Mar 2024 04:37:21 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=heinrich.schuchardt@canonical.com Received: from LT2ubnt.fritz.box (ip-062-143-245-032.um16.pools.vodafone-ip.de [62.143.245.32]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id CB47941DB4; Sun, 31 Mar 2024 02:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1711852641; bh=MbYY7Pafw0jS1V1XBs3UwCyHl/aN66/0vkEYVzy+FmY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EwVrBOjU70I9bo/Y+TVBl3zEZq2QWiQaudQA6KD91wFBKEGGlU/Ex7q/gtkTp7jwR QzqEHXXoWn/BH/nhZSOaDgk85JFN1gBiGHPhOvSf3NFBi7//zFDAa7JCvXEASCgWap 05k4/9qTsiXr2MEEX09gwQA4ac717qWMdyBcOMtrx7s7MI8W1jQ8jtjAWt3nfs5nbn B2W3Md169Bb8Z0msCOGiazVMQDXyOMngwXFZg7IoAqLnOkULWNfVeUjfU6D1dVJqOJ U0luB53hXuO3xnv29SjWilq7XbRzvYbg8UlZRfCdTkNW6FAv56VQSwgMJp1KuwfSLM FuJEVM7Nhjo+w== From: Heinrich Schuchardt To: Jagan Teki , Andre Przywara Cc: Hans de Goede , Tom Rini , Samuel Holland , u-boot@lists.denx.de, Heinrich Schuchardt Subject: [PATCH 2/2] sunxi: CONFIG_SYS_MMC_ENV_DEV undeclared Date: Sun, 31 Mar 2024 04:37:17 +0200 Message-ID: <20240331023718.52064-3-heinrich.schuchardt@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240331023718.52064-1-heinrich.schuchardt@canonical.com> References: <20240331023718.52064-1-heinrich.schuchardt@canonical.com> MIME-Version: 1.0 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.8 at phobos.denx.de X-Virus-Status: Clean bananapi_m64_defconfig with CONFIG_ENV_IS_NOWHERE results in: board/sunxi/board.c: In function 'mmc_get_env_dev': board/sunxi/board.c:535:24: error: 'CONFIG_SYS_MMC_ENV_DEV' undeclared (first use in this function) 535 | return CONFIG_SYS_MMC_ENV_DEV; | ^~~~~~~~~~~~~~~~~~~~~~ Check if CONFIG_SYS_MMC_ENV_DEV is defined. Fixes: 1011ebc72bda ("sunxi: Select environment MMC based on boot device") Signed-off-by: Heinrich Schuchardt --- board/sunxi/board.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 8c12c8deade..c849bbe8267 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -523,7 +523,7 @@ int board_mmc_init(struct bd_info *bis) return 0; } -#if CONFIG_MMC_SUNXI_SLOT_EXTRA != -1 +#ifdef CONFIG_SYS_MMC_ENV_DEV int mmc_get_env_dev(void) { switch (sunxi_get_boot_device()) {