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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 115A4C433F5 for ; Fri, 22 Oct 2021 13:48:37 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7B11161215 for ; Fri, 22 Oct 2021 13:48:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7B11161215 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AFFD583548; Fri, 22 Oct 2021 15:48:13 +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="UYdofsoq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 24EA4831FD; Fri, 22 Oct 2021 15:47:46 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (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 F16AE83459; Fri, 22 Oct 2021 15:47:38 +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=kabel@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id 8105F61215; Fri, 22 Oct 2021 13:47:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634910456; bh=Qh8HHn7vC6qWSg9JK+G/YEBud04bMlDpWbb1vdbQV8I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UYdofsoq9T6R9n88Z6ZEuFZadBwnojzOcBgHjGVlQaAAITGf3mv205VXYZ+ins6CB kO+fJTA1DAGFvc8iOao5KrE4lmOG7aT2KJoI+WMVQ3DuczzPjzEe3NZRhOP2qGSfS+ osQmlhKQqpO3wWzqLWWy1afrO0+c8JF9z/5mGs3tmyO+YTQp3hsQ9FvFsSiGtTwki3 sWge6EyFfoXwXl5Vb7/B2x5n3i/giq/Lsag1f7ImGdHfOK5d6oWkeGzIuRznJIN5eG 2K7mdUWpXY2UbGERQuIx3/Aw2QDjjmqaNDYXGjXmlFY9sa0iJCBKTuBlqiEeqfSf7i hGCSJg5sIS7qQ== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: u-boot-board-maintainers@lists.denx.de, u-boot-custodians@lists.denx.de, Tom Rini , Simon Glass , u-boot@lists.denx.de, Joe Hershberger , Wolfgang Denk Cc: =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 03/14] env: sf: Put ENV_INVALID into gd->env_valid on CRC failure Date: Fri, 22 Oct 2021 15:47:14 +0200 Message-Id: <20211022134725.26004-4-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211022134725.26004-1-kabel@kernel.org> References: <20211022134725.26004-1-kabel@kernel.org> 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.34 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.2 at phobos.denx.de X-Virus-Status: Clean From: Marek Behún env_sf_init_addr() says the environment is valid even if it is assigning default environment due to CRC failure. Change this to ENV_INVALID and let the generic env_init() function, which calls this initializer, assign the default environment. Signed-off-by: Marek Behún --- env/sf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/env/sf.c b/env/sf.c index c251d076d7..6a4bb756f0 100644 --- a/env/sf.c +++ b/env/sf.c @@ -341,8 +341,7 @@ static int env_sf_init_addr(void) gd->env_addr = (ulong)&(env_ptr->data); gd->env_valid = ENV_VALID; } else { - gd->env_addr = (ulong)&default_environment[0]; - gd->env_valid = ENV_VALID; + gd->env_valid = ENV_INVALID; } return 0; -- 2.32.0