smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

env: Add an enum for environment state

Browse Source 
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>
This commit is contained in:
Simon Glass
2017-08-03 12:21:56 -06:00
committed by Tom Rini
parent 75de597d2d
commit 203e94f6c9
28 changed files with 104 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
env/ubi.c vendored
View File

@@ -26,7 +26,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;
}
@@ -48,7 +48,7 @@ int saveenv(void)
return 1;
}
if (gd->env_valid == 1) {
if (gd->env_valid == ENV_VALID) {
puts("Writing to redundant UBI... ");
if (ubi_volume_write(CONFIG_ENV_UBI_VOLUME_REDUND,
(void *)env_new, CONFIG_ENV_SIZE)) {
@@ -70,7 +70,7 @@ int saveenv(void)
puts("done\n");
gd->env_valid = gd->env_valid == 2 ? 1 : 2;
gd->env_valid = gd->env_valid == ENV_REDUND ? ENV_VALID : ENV_REDUND;
return 0;
}