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

[Joris OFFOUGA]

Hi Pierre-Jean

It's work on my side.

Tested-by Joris Offouga <offougajoris at gmail.com>

Best Regards,
Joris Offouga

Le ven. 23 août 2019 à 23:04, Pierre-Jean Texier <pjtexier at koncepto.io> a
écrit :

> 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>
> ---
>  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 <env_default.h>
>
> --
> 2.7.4
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> https://lists.denx.de/listinfo/u-boot
>