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 1D12DC433EF for ; Fri, 22 Oct 2021 13:49:15 +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 8F04061215 for ; Fri, 22 Oct 2021 13:49:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8F04061215 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 B3D4E83508; Fri, 22 Oct 2021 15:48: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=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="A0BvhcuE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2CD0983459; Fri, 22 Oct 2021 15:48:04 +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 4E19783535; Fri, 22 Oct 2021 15:47: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=kabel@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id 7E24C6124D; Fri, 22 Oct 2021 13:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634910466; bh=w9AybUZ/uxLDtZo1W05bl/1qcpMo99paFWMj6kZlL1U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A0BvhcuEDwEPmOG1Fex8N0O18IQpmDORA0bpXJoRWy/Kd1byw2hm8kolShZZ6/I0n 0X3aQ/Lce/+oC1Gd8V7sNg91DRUdGmLEFWDsU8OcVFAVZn0V9WqJCWV3AvlIbxOERP UXkq+Zwc8jSPQX07Rw3lPFlJgxGs4emkSI8+FET+whGpPSqeiOsaIrr9gr22bDK3Ik e6OnR5Lw5mclg0qOilEYE0JeGqOEs4TtApfFnMw4ry7Iwme5oggTIBKJ1MQG8D17Kj 82vR5nuCjVKwchZjARdr1ihLhRH8kQEahNKYsxIpCymnn3Wbe6pQ9m5l5NIbZ/kQBQ 1+d2SBZOlX8Yg== 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 09/14] env: flash: Let generic env_init() assign default environment Date: Fri, 22 Oct 2021 15:47:20 +0200 Message-Id: <20211022134725.26004-10-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_flash_init() (both implementations) assigns default environment if ENV_INVALID, but this is done in the generic env_init() function, which calls this initializer, so drop it from here. Signed-off-by: Marek Behún --- env/flash.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/env/flash.c b/env/flash.c index ebee9069e4..77d4c030a5 100644 --- a/env/flash.c +++ b/env/flash.c @@ -77,7 +77,6 @@ static int env_flash_init(void) uchar flag1 = flash_addr->flags; uchar flag2 = flash_addr_new->flags; - ulong addr_default = (ulong)&default_environment[0]; ulong addr1 = (ulong)&(flash_addr->data); ulong addr2 = (ulong)&(flash_addr_new->data); @@ -92,7 +91,6 @@ static int env_flash_init(void) gd->env_addr = addr2; gd->env_valid = ENV_VALID; } else if (!crc1_ok && !crc2_ok) { - gd->env_addr = addr_default; gd->env_valid = ENV_INVALID; } else if (flag1 == ENV_REDUND_ACTIVE && flag2 == ENV_REDUND_OBSOLETE) { @@ -231,7 +229,6 @@ static int env_flash_init(void) return 0; } - gd->env_addr = (ulong)&default_environment[0]; gd->env_valid = ENV_INVALID; return 0; } -- 2.32.0