]> git.dujemihanovic.xyz Git - u-boot.git/commit
fw_env: remove duplicated definitions
authorPierre-Jean Texier <pjtexier@koncepto.io>
Mon, 26 Aug 2019 11:06:15 +0000 (13:06 +0200)
committerTom Rini <trini@konsulko.com>
Tue, 24 Sep 2019 21:46:13 +0000 (17:46 -0400)
commite184a3b4fd5809a03fa8a821137103bcbbda4cd0
tree7c29ec7e64e119452dc5693758e675272b3c7538
parent31e086e460fb5de6dd42559babdc1e027ed2fe96
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>
tools/env/fw_env.c