diff options
| author | Simon Glass <sjg@chromium.org> | 2017-08-03 12:21:56 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-15 08:18:51 -0400 |
| commit | 203e94f6c9ca03e260175ce240f5856507395585 (patch) | |
| tree | 1b13b0ff87c4117e18e6ee7db97e09c541724b69 /env/mmc.c | |
| parent | 75de597d2d91b1102584d4b641daf592d894207e (diff) | |
| download | u-boot-203e94f6c9ca03e260175ce240f5856507395585.tar.gz u-boot-203e94f6c9ca03e260175ce240f5856507395585.tar.bz2 u-boot-203e94f6c9ca03e260175ce240f5856507395585.zip | |
env: Add an enum for environment state
At present we have three states for the environment, numbered 0, 1 and 2.
Add an enum to record this to avoid open-coded values.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'env/mmc.c')
| -rw-r--r-- | env/mmc.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -86,7 +86,7 @@ int env_init(void) { /* use default */ gd->env_addr = (ulong)&default_environment[0]; - gd->env_valid = 1; + gd->env_valid = ENV_VALID; return 0; } @@ -180,7 +180,7 @@ int saveenv(void) goto fini; #ifdef CONFIG_ENV_OFFSET_REDUND - if (gd->env_valid == 1) + if (gd->env_valid == ENV_VALID) copy = 1; #endif @@ -200,7 +200,7 @@ int saveenv(void) ret = 0; #ifdef CONFIG_ENV_OFFSET_REDUND - gd->env_valid = gd->env_valid == 2 ? 1 : 2; + gd->env_valid = gd->env_valid == ENV_REDUND ? ENV_VALID : ENV_REDUND; #endif fini: @@ -265,10 +265,10 @@ void env_relocate_spec(void) ret = 1; goto fini; } else if (!read1_fail && read2_fail) { - gd->env_valid = 1; + gd->env_valid = ENV_VALID; env_import((char *)tmp_env1, 1); } else if (read1_fail && !read2_fail) { - gd->env_valid = 2; + gd->env_valid = ENV_REDUND; env_import((char *)tmp_env2, 1); } else { env_import_redund((char *)tmp_env1, (char *)tmp_env2); |