Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

env: Replace all open-coded gd->env_valid values with ENV_ flags

Browse source 
Some of these were missed in the conversion.
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-08-20 04:45:15 -06:00 committed by Tom Rini
parent c55d8b9400
commit 2d7cb5b426
6 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
env/common.c vendored
View file

@ -52,7 +52,7 @@ char *env_get_default(const char *name)
/* Pretend that the image is bad. */
gd->flags &= ~GD_FLG_ENV_READY;
gd->env_valid = 0;
gd->env_valid = ENV_INVALID;
ret_val = env_get(name);
gd->env_valid = really_valid;
gd->flags = real_gd_flags;
@ -210,24 +210,24 @@ int env_import_redund(const char *buf1, const char *buf2)
set_default_env("!bad CRC");
return 0;
} else if (crc1_ok && !crc2_ok) {
gd->env_valid = 1;
gd->env_valid = ENV_VALID;
} else if (!crc1_ok && crc2_ok) {
gd->env_valid = 2;
gd->env_valid = ENV_REDUND;
} else {
/* both ok - check serial */
if (tmp_env1->flags == 255 && tmp_env2->flags == 0)
gd->env_valid = 2;
gd->env_valid = ENV_REDUND;
else if (tmp_env2->flags == 255 && tmp_env1->flags == 0)
gd->env_valid = 1;
gd->env_valid = ENV_VALID;
else if (tmp_env1->flags > tmp_env2->flags)
gd->env_valid = 1;
gd->env_valid = ENV_VALID;
else if (tmp_env2->flags > tmp_env1->flags)
gd->env_valid = 2;
gd->env_valid = ENV_REDUND;
else /* flags are equal - almost impossible */
gd->env_valid = 1;
gd->env_valid = ENV_VALID;
}
if (gd->env_valid == 1)
if (gd->env_valid == ENV_VALID)
ep = tmp_env1;
else
ep = tmp_env2;
@ -271,7 +271,7 @@ void env_relocate(void)
env_reloc();
env_htab.change_ok += gd->reloc_off;
#endif
if (gd->env_valid == 0) {
if (gd->env_valid == ENV_INVALID) {
#if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD)
/* Environment not changable */
set_default_env(NULL);

6
env/eeprom.c vendored
View file

@ -122,7 +122,7 @@ static int env_eeprom_load(void)
if (!crc_ok[0] && !crc_ok[1]) {
gd->env_addr = 0;
gd->env_valid = 0;
gd->env_valid = ENV_INVALID;
} else if (crc_ok[0] && !crc_ok[1]) {
gd->env_valid = ENV_VALID;
} else if (!crc_ok[0] && crc_ok[1]) {
@ -166,9 +166,9 @@ static int env_eeprom_load(void)
}
if (crc == new) {
gd->env_valid = ENV_VALID;
gd->env_valid = ENV_VALID;
} else {
gd->env_valid = 0;
gd->env_valid = ENV_INVALID;
}
#endif /* CONFIG_ENV_OFFSET_REDUND */

2
env/env.c vendored
View file

@ -74,7 +74,7 @@ int env_get_char(int index)
struct env_driver *drv = env_driver_lookup_default();
int ret;
if (!gd->env_valid)
if (gd->env_valid == ENV_INVALID)
return default_environment[index];
if (!drv)
return -ENODEV;

4
env/flash.c vendored
View file

@ -94,7 +94,7 @@ static int env_flash_init(void)
gd->env_valid = ENV_VALID;
} else if (!crc1_ok && !crc2_ok) {
gd->env_addr = addr_default;
gd->env_valid = 0;
gd->env_valid = ENV_INVALID;
} else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) {
gd->env_addr = addr1;
gd->env_valid = ENV_VALID;
@ -231,7 +231,7 @@ static int env_flash_init(void)
}
gd->env_addr = (ulong)&default_environment[0];
gd->env_valid = 0;
gd->env_valid = ENV_INVALID;
return 0;
}
#endif

2
env/nand.c vendored
View file

@ -79,7 +79,7 @@ static int env_nand_init(void)
if (!crc1_ok && !crc2_ok) {
gd->env_addr = 0;
gd->env_valid = 0;
gd->env_valid = ENV_INVALID;
return 0;
} else if (crc1_ok && !crc2_ok) {

2
env/nvram.c vendored
View file

@ -106,7 +106,7 @@ static int env_nvram_init(void)
gd->env_valid = ENV_VALID;
} else {
gd->env_addr = (ulong)&default_environment[0];
gd->env_valid = 0;
gd->env_valid = ENV_INVALID;
}
return 0;