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 F09F8C433EF for ; Fri, 22 Oct 2021 13:49:05 +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 6C5D56112F for ; Fri, 22 Oct 2021 13:49:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6C5D56112F 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 2A9AF8353E; Fri, 22 Oct 2021 15:48:24 +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="Pb7tCb30"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EE15983539; 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 D3A7583508; Fri, 22 Oct 2021 15:47:40 +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 2A3196120D; Fri, 22 Oct 2021 13:47:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634910459; bh=/rIyyu6dj542RBVcZBFT/RyoMORUDUI854sqpAgVXnw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pb7tCb30vEZjYOFO7nVZp8z5tBQkul0+LluSDJKU3ogwcoVxU3VbMCBnq+yDBtZek zKmfppVobBoieLFS0Kki3guYu6CiFUoU37Ry3uPK3Q1seUmmqW6AHa7fME/mU/ETSy g4CQOjwTLwmDW4mGecwXw4UquMKn2c13NrEpf2haG/5ckGApq86OMhZYLDPemV7j0g nsHTf8LRW8FFYsTIxGBV/Kp8D9r2OtIJfAkisyxbp/TEN8ijP3OAuYvBlhuJcUtHsE +saGNtce1zjZa5OPEdxc6W0JqSLxI8oQFto5LWMUAuo92T/KVjCI3+lEq5M7Fxnkrw xYV2e1ATGVH3w== 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 05/14] env: nvram: Let generic env_init() assign default environment Date: Fri, 22 Oct 2021 15:47:16 +0200 Message-Id: <20211022134725.26004-6-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_nvram_init() 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/nvram.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/env/nvram.c b/env/nvram.c index 261b31edfb..297573c4ed 100644 --- a/env/nvram.c +++ b/env/nvram.c @@ -94,8 +94,7 @@ static int env_nvram_init(void) #endif gd->env_valid = ENV_VALID; } else { - gd->env_addr = (ulong)&default_environment[0]; - gd->env_valid = ENV_INVALID; + gd->env_valid = ENV_INVALID; } return 0; -- 2.32.0