diff options
| author | Pierre-Jean Texier <pjtexier@koncepto.io> | 2019-08-26 13:06:15 +0200 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-09-24 17:46:13 -0400 |
| commit | e184a3b4fd5809a03fa8a821137103bcbbda4cd0 (patch) | |
| tree | 7c29ec7e64e119452dc5693758e675272b3c7538 /tools/env/fw_env.c | |
| parent | 31e086e460fb5de6dd42559babdc1e027ed2fe96 (diff) | |
| download | u-boot-e184a3b4fd5809a03fa8a821137103bcbbda4cd0.zip u-boot-e184a3b4fd5809a03fa8a821137103bcbbda4cd0.tar.gz u-boot-e184a3b4fd5809a03fa8a821137103bcbbda4cd0.tar.bz2 | |
fw_env: remove duplicated definitions
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 <pjtexier@koncepto.io>
Tested-by: Joris Offouga <offougajoris@gmail.com>
Tested-by: Heiko Schocher <hs@denx.de>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Diffstat (limited to 'tools/env/fw_env.c')
| -rw-r--r-- | tools/env/fw_env.c | 7 |
1 files changed, 0 insertions, 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 <env_default.h> |