From patchwork Mon Aug 26 11:06:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre-Jean Texier X-Patchwork-Id: 1153103 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=quarantine dis=none) header.from=koncepto.io Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=koncepto.io header.i=@koncepto.io header.b="oiyEB9Yh"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46H8NK1LPKz9sDB for ; Mon, 26 Aug 2019 21:07:13 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id CAF1DC21F7D; Mon, 26 Aug 2019 11:06:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0AA54C21FCA; Mon, 26 Aug 2019 11:06:52 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 27147C21FB5; Mon, 26 Aug 2019 11:06:47 +0000 (UTC) Received: from koncepto.io (koncepto.io [195.154.119.111]) by lists.denx.de (Postfix) with ESMTPS id A73A1C21F9A for ; Mon, 26 Aug 2019 11:06:44 +0000 (UTC) Received: from menoah.home (lfbn-1-8923-205.w193-250.abo.wanadoo.fr [193.250.65.205]) by koncepto.io (Postfix) with ESMTPSA id 0C8AF602CF; Mon, 26 Aug 2019 13:06:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; s=default; t=1566817604; bh=V4r1z9HD8aVGoyELWRC99LX8pZowixLpYqFHkVfjVik=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oiyEB9YhFL8jh+kux8tsm0WhBM8b/ijFR0262b6Oe55f6YePlv9wHb6b1pEW1Fs62 gNimouSjMWLCAW2wZquTDRjoQoRVCykS9rPbigionFMazyPmt1F0vDBpjoN75MDJl9 yx8GGplCS3yU5fHLkfd1SKxnta0u7sLu7EnjfagoI6XuV53Ix6DkJAvkvPfgUhl1hD 2Cz7oBfJafbblAdKb019EWk6TTrW86ASL0aHwKF/R3hXfDjwLN2gzhD0pckzmEklxR Z+9c649IYaa9B3K3PAdhRoQ5lptYyVqLNrAffsabjbXQzrxyBcGEg5hRnleeede86M 4HoWxUCDgE5EQ== From: Pierre-Jean Texier To: u-boot@lists.denx.de Date: Mon, 26 Aug 2019 13:06:15 +0200 Message-Id: <1566817578-16750-2-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1566817578-16750-1-git-send-email-pjtexier@koncepto.io> References: <1566817578-16750-1-git-send-email-pjtexier@koncepto.io> MIME-Version: 1.0 Cc: bjorn@haxx.se, michal.simek@xilinx.com, joe.hershberger@ni.com, philip@philipmolloy.com Subject: [U-Boot] [PATCH v2 1/4] fw_env: remove duplicated definitions X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Since commit d3716dd ("env: Rename the redundancy flags"), the definitions of ENV_REDUND_OBSOLETE & ENV_REDUND_ACTIVE was moved to env.h. Fixes: tools/env/fw_env.c:122:22: error: ‘ENV_REDUND_ACTIVE’ redeclared as different kind of symbol static unsigned char ENV_REDUND_ACTIVE = 1; ^~~~~~~~~~~~~~~~~ In file included from tools/env/fw_env.c:13: include/env.h:63:2: note: previous definition of ‘ENV_REDUND_ACTIVE’ was here ENV_REDUND_ACTIVE = 1, ^~~~~~~~~~~~~~~~~ tools/env/fw_env.c:127:22: error: ‘ENV_REDUND_OBSOLETE’ redeclared as different kind of symbol static unsigned char ENV_REDUND_OBSOLETE; ^~~~~~~~~~~~~~~~~~~ In file included from tools/env/fw_env.c:13: include/env.h:62:2: note: previous definition of ‘ENV_REDUND_OBSOLETE’ was here ENV_REDUND_OBSOLETE = 0, Signed-off-by: Pierre-Jean Texier Tested-by: Joris Offouga Tested-by: Heiko Schocher Acked-by: Joe Hershberger --- v1 -> v2: - None tools/env/fw_env.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 95c9984..876bf2b 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -119,13 +119,6 @@ static struct environment environment = { static int have_redund_env; -static unsigned char ENV_REDUND_ACTIVE = 1; -/* - * ENV_REDUND_OBSOLETE must be 0 to efficiently set it on NOR flash without - * erasing - */ -static unsigned char ENV_REDUND_OBSOLETE; - #define DEFAULT_ENV_INSTANCE_STATIC #include