diff options
| author | Philippe Reynes <philippe.reynes@softathome.com> | 2019-10-14 19:41:06 +0200 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2019-10-16 05:53:37 +0200 |
| commit | 611623417403256dc79205a89d4dc7f826bc805f (patch) | |
| tree | f5c8c151a54146b43387ea3d6644248c77549787 /include | |
| parent | e6661cf767ce644e6ff835537449979859060c5b (diff) | |
| download | u-boot-611623417403256dc79205a89d4dc7f826bc805f.tar.gz | |
ubi: env: fix redundand management
We check (with a #if defined()) the config ENV_UBI_VOLUME_REDUND
to know if there is a redundant env. But this config is a string
and is always defined with env is in ubi, so we always consider
that a redundand env is used.
To fix this issue, I've added a hidden flag ENV_UBI_IS_VOLUME_REDUND
that is true when ENV_UBI_VOLUME_REDUND is not "". Then, I check
this flag in the code, instead of the string ENV_UBI_VOLUME_REDUND.
hs: fixed typo s/condider/consider
Signed-off-by: Philippe Reynes <philippe.reynes@softathome.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/env_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/env_internal.h b/include/env_internal.h index b1ddcb5adf..88c36b32a1 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -101,7 +101,7 @@ extern unsigned long nand_env_oob_offset; # ifndef CONFIG_ENV_UBI_VOLUME # error "Need to define CONFIG_ENV_UBI_VOLUME when using CONFIG_ENV_IS_IN_UBI" # endif -# if defined(CONFIG_ENV_UBI_VOLUME_REDUND) +# if defined(CONFIG_ENV_UBI_IS_VOLUME_REDUND) # define CONFIG_SYS_REDUNDAND_ENVIRONMENT # endif # ifndef CONFIG_ENV_SIZE |