Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 07:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "fw_printenv: Don't bail out directly after one env read error"

Browse source 
As pointed out by Wolfgang Denk, the problem with this fix is that while
interactive users will see that we have found one part of the
environment failed and are using the other, progmatic use will not see
this and can lead to problems.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2018-07-01 22:10:33 -04:00
parent 3fcb00be25
commit 168de20f3b
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tools/env/fw_env.c vendored
View file

@ -1427,21 +1427,14 @@ int fw_env_open(struct env_opts *opts)
}
dev_current = 0;
if (!flash_io(O_RDONLY)) {
crc0 = crc32(0, (uint8_t *)environment.data, ENV_SIZE);
crc0_ok = (crc0 == *environment.crc);
} else if (have_redund_env) {
/*
* to give the redundant env a chance, maybe it's good:
* mark env crc0 invalid then test below if crc1 is ok
*/
crc0_ok = 0;
} else {
if (flash_io(O_RDONLY)) {
ret = -EIO;
goto open_cleanup;
}
crc0 = crc32(0, (uint8_t *)environment.data, ENV_SIZE);
crc0_ok = (crc0 == *environment.crc);
if (!have_redund_env) {
if (!crc0_ok) {
fprintf(stderr,
@ -1469,10 +1462,8 @@ int fw_env_open(struct env_opts *opts)
*/
environment.image = addr1;
if (flash_io(O_RDONLY)) {
crc1_ok = 0;
} else {
crc1 = crc32(0, (uint8_t *)redundant->data, ENV_SIZE);
crc1_ok = (crc1 == redundant->crc);
ret = -EIO;
goto open_cleanup;
}
/* Check flag scheme compatibility */
@ -1498,6 +1489,9 @@ int fw_env_open(struct env_opts *opts)
goto open_cleanup;
}
crc1 = crc32(0, (uint8_t *)redundant->data, ENV_SIZE);
crc1_ok = (crc1 == redundant->crc);
flag1 = redundant->flags;
if (crc0_ok && !crc1_ok) {