diff options
| author | Philippe Reynes <[email protected]> | 2019-10-14 19:41:06 +0200 |
|---|---|---|
| committer | Heiko Schocher <[email protected]> | 2019-10-16 05:53:37 +0200 |
| commit | 611623417403256dc79205a89d4dc7f826bc805f (patch) | |
| tree | f5c8c151a54146b43387ea3d6644248c77549787 | |
| parent | e6661cf767ce644e6ff835537449979859060c5b (diff) | |
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 <[email protected]>
Reviewed-by: Heiko Schocher <[email protected]>
| -rw-r--r-- | env/Kconfig | 6 | ||||
| -rw-r--r-- | include/env_internal.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/env/Kconfig b/env/Kconfig index e4ba12ece3f..bc03816bc8b 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -516,6 +516,12 @@ config ENV_UBI_VOLUME_REDUND help Name of the redundant volume that you want to store the environment in. +config ENV_UBI_IS_VOLUME_REDUND + bool + depends on ENV_IS_IN_UBI + default y if ENV_UBI_VOLUME_REDUND != "" + default n + config ENV_UBI_VID_OFFSET int "ubi environment VID offset" depends on ENV_IS_IN_UBI diff --git a/include/env_internal.h b/include/env_internal.h index b1ddcb5adfd..88c36b32a1e 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 |