Message ID | 1566817578-16750-2-git-send-email-pjtexier@koncepto.io |
---|---|
State | Accepted |
Commit | e184a3b4fd5809a03fa8a821137103bcbbda4cd0 |
Delegated to: | Tom Rini |
Headers | show |
Series | env: fix build error for envtools | expand |
On Mon, Aug 26, 2019 at 6:08 AM Pierre-Jean Texier <pjtexier@koncepto.io> wrote: > > 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>
On Mon, Aug 26, 2019 at 01:06:15PM +0200, Pierre-Jean Texier wrote: > 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> Applied to u-boot/master, thanks!
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>