From patchwork Fri Aug 23 21:03:16 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: 1152434 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="pNQdPEmE"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46FYnW5SRZz9s7T for ; Sat, 24 Aug 2019 07:05:03 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 6AC85C22128; Fri, 23 Aug 2019 21:04:09 +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 22BCCC2211C; Fri, 23 Aug 2019 21:04:03 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C539FC220FB; Fri, 23 Aug 2019 21:03:59 +0000 (UTC) Received: from koncepto.io (koncepto.io [195.154.119.111]) by lists.denx.de (Postfix) with ESMTPS id 00EFDC21C29 for ; Fri, 23 Aug 2019 21:03:58 +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 6577E6027E; Fri, 23 Aug 2019 23:03:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=koncepto.io; s=default; t=1566594237; bh=1A6uYtcv7poOVUlwbsHD8uICjE/sD7eKsXfiKdjIzE0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pNQdPEmEp/YVx2uHZaOLlkfc+yoEMwug74Mi62v19dvMw1UAykCHu1Ex/mk/7w9wF 8mpXN+1P2wpCWIyTN86BNbmBUrEE1q18nJL1xMalMn0CQXXaL/o5aBAMDDUto3shoL FhuP0+U2ky+BeHGMr/YZZQhaOHR9HtxYZGIr9D4IRsX0jqRJxTzxmcyaJr9jzOSus9 SrRFMD9Thr8uxv1tPOXk1vtMtUrUYhlulvxF3tRFwr6S/nPZEfJP5F4A9iJDoobPTn LQrE0JRQKALig+LKrec4hi8gRn20HinWxj/dl2utVwsJdtxA4C4nG1aCL+PghaEh0+ APc7DCJINwsJA== From: Pierre-Jean Texier To: u-boot@lists.denx.de Date: Fri, 23 Aug 2019 23:03:16 +0200 Message-Id: <1566594199-25314-2-git-send-email-pjtexier@koncepto.io> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1566594199-25314-1-git-send-email-pjtexier@koncepto.io> References: <1566594199-25314-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 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: Heiko Schocher Acked-by: Joe Hershberger --- 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