aboutsummaryrefslogtreecommitdiff
path: root/env
diff options
context:
space:
mode:
authorPhilippe Reynes2019-10-14 19:41:06 +0200
committerHeiko Schocher2019-10-16 05:53:37 +0200
commit611623417403256dc79205a89d4dc7f826bc805f (patch)
treef5c8c151a54146b43387ea3d6644248c77549787 /env
parente6661cf767ce644e6ff835537449979859060c5b (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 <philippe.reynes@softathome.com> Reviewed-by: Heiko Schocher <hs@denx.de>
Diffstat (limited to 'env')
-rw-r--r--env/Kconfig6
1 files changed, 6 insertions, 0 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