mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-28 23:50:26 +09:00
env: Replace all open-coded gd->env_valid values with ENV_ flags
Some of these were missed in the conversion. Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
parent
c55d8b9400
commit
2d7cb5b426
20
env/common.c
vendored
20
env/common.c
vendored
@ -52,7 +52,7 @@ char *env_get_default(const char *name)
|
|||||||
|
|
||||||
/* Pretend that the image is bad. */
|
/* Pretend that the image is bad. */
|
||||||
gd->flags &= ~GD_FLG_ENV_READY;
|
gd->flags &= ~GD_FLG_ENV_READY;
|
||||||
gd->env_valid = 0;
|
gd->env_valid = ENV_INVALID;
|
||||||
ret_val = env_get(name);
|
ret_val = env_get(name);
|
||||||
gd->env_valid = really_valid;
|
gd->env_valid = really_valid;
|
||||||
gd->flags = real_gd_flags;
|
gd->flags = real_gd_flags;
|
||||||
@ -210,24 +210,24 @@ int env_import_redund(const char *buf1, const char *buf2)
|
|||||||
set_default_env("!bad CRC");
|
set_default_env("!bad CRC");
|
||||||
return 0;
|
return 0;
|
||||||
} else if (crc1_ok && !crc2_ok) {
|
} else if (crc1_ok && !crc2_ok) {
|
||||||
gd->env_valid = 1;
|
gd->env_valid = ENV_VALID;
|
||||||
} else if (!crc1_ok && crc2_ok) {
|
} else if (!crc1_ok && crc2_ok) {
|
||||||
gd->env_valid = 2;
|
gd->env_valid = ENV_REDUND;
|
||||||
} else {
|
} else {
|
||||||
/* both ok - check serial */
|
/* both ok - check serial */
|
||||||
if (tmp_env1->flags == 255 && tmp_env2->flags == 0)
|
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)
|
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)
|
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)
|
else if (tmp_env2->flags > tmp_env1->flags)
|
||||||
gd->env_valid = 2;
|
gd->env_valid = ENV_REDUND;
|
||||||
else /* flags are equal - almost impossible */
|
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;
|
ep = tmp_env1;
|
||||||
else
|
else
|
||||||
ep = tmp_env2;
|
ep = tmp_env2;
|
||||||
@ -271,7 +271,7 @@ void env_relocate(void)
|
|||||||
env_reloc();
|
env_reloc();
|
||||||
env_htab.change_ok += gd->reloc_off;
|
env_htab.change_ok += gd->reloc_off;
|
||||||
#endif
|
#endif
|
||||||
if (gd->env_valid == 0) {
|
if (gd->env_valid == ENV_INVALID) {
|
||||||
#if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD)
|
#if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD)
|
||||||
/* Environment not changable */
|
/* Environment not changable */
|
||||||
set_default_env(NULL);
|
set_default_env(NULL);
|
||||||
|
4
env/eeprom.c
vendored
4
env/eeprom.c
vendored
@ -122,7 +122,7 @@ static int env_eeprom_load(void)
|
|||||||
|
|
||||||
if (!crc_ok[0] && !crc_ok[1]) {
|
if (!crc_ok[0] && !crc_ok[1]) {
|
||||||
gd->env_addr = 0;
|
gd->env_addr = 0;
|
||||||
gd->env_valid = 0;
|
gd->env_valid = ENV_INVALID;
|
||||||
} else if (crc_ok[0] && !crc_ok[1]) {
|
} else if (crc_ok[0] && !crc_ok[1]) {
|
||||||
gd->env_valid = ENV_VALID;
|
gd->env_valid = ENV_VALID;
|
||||||
} else if (!crc_ok[0] && crc_ok[1]) {
|
} else if (!crc_ok[0] && crc_ok[1]) {
|
||||||
@ -168,7 +168,7 @@ static int env_eeprom_load(void)
|
|||||||
if (crc == new) {
|
if (crc == new) {
|
||||||
gd->env_valid = ENV_VALID;
|
gd->env_valid = ENV_VALID;
|
||||||
} else {
|
} else {
|
||||||
gd->env_valid = 0;
|
gd->env_valid = ENV_INVALID;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_ENV_OFFSET_REDUND */
|
#endif /* CONFIG_ENV_OFFSET_REDUND */
|
||||||
|
|
||||||
|
2
env/env.c
vendored
2
env/env.c
vendored
@ -74,7 +74,7 @@ int env_get_char(int index)
|
|||||||
struct env_driver *drv = env_driver_lookup_default();
|
struct env_driver *drv = env_driver_lookup_default();
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if (!gd->env_valid)
|
if (gd->env_valid == ENV_INVALID)
|
||||||
return default_environment[index];
|
return default_environment[index];
|
||||||
if (!drv)
|
if (!drv)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
4
env/flash.c
vendored
4
env/flash.c
vendored
@ -94,7 +94,7 @@ static int env_flash_init(void)
|
|||||||
gd->env_valid = ENV_VALID;
|
gd->env_valid = ENV_VALID;
|
||||||
} else if (!crc1_ok && !crc2_ok) {
|
} else if (!crc1_ok && !crc2_ok) {
|
||||||
gd->env_addr = addr_default;
|
gd->env_addr = addr_default;
|
||||||
gd->env_valid = 0;
|
gd->env_valid = ENV_INVALID;
|
||||||
} else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) {
|
} else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) {
|
||||||
gd->env_addr = addr1;
|
gd->env_addr = addr1;
|
||||||
gd->env_valid = ENV_VALID;
|
gd->env_valid = ENV_VALID;
|
||||||
@ -231,7 +231,7 @@ static int env_flash_init(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
gd->env_addr = (ulong)&default_environment[0];
|
gd->env_addr = (ulong)&default_environment[0];
|
||||||
gd->env_valid = 0;
|
gd->env_valid = ENV_INVALID;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
2
env/nand.c
vendored
2
env/nand.c
vendored
@ -79,7 +79,7 @@ static int env_nand_init(void)
|
|||||||
|
|
||||||
if (!crc1_ok && !crc2_ok) {
|
if (!crc1_ok && !crc2_ok) {
|
||||||
gd->env_addr = 0;
|
gd->env_addr = 0;
|
||||||
gd->env_valid = 0;
|
gd->env_valid = ENV_INVALID;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
} else if (crc1_ok && !crc2_ok) {
|
} else if (crc1_ok && !crc2_ok) {
|
||||||
|
2
env/nvram.c
vendored
2
env/nvram.c
vendored
@ -106,7 +106,7 @@ static int env_nvram_init(void)
|
|||||||
gd->env_valid = ENV_VALID;
|
gd->env_valid = ENV_VALID;
|
||||||
} else {
|
} else {
|
||||||
gd->env_addr = (ulong)&default_environment[0];
|
gd->env_addr = (ulong)&default_environment[0];
|
||||||
gd->env_valid = 0;
|
gd->env_valid = ENV_INVALID;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
Loading…
Reference in New Issue
Block a user