[U-Boot] [PATCH v2 1/4] fw_env: remove duplicated definitions

[Tom Rini]

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 at koncepto.io>
> Tested-by: Joris Offouga <offougajoris at gmail.com>
> Tested-by: Heiko Schocher <hs at denx.de>
> Acked-by: Joe Hershberger <joe.hershberger at ni.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190925/b9ce6065/attachment.sig>