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

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

Browse Source 
When using a redundant environment a read error should simply mean to
not use that copy instead of giving up completely. The other copy may
be just fine.

Signed-off-by: Joe Hershberger <joe.hershberger@ni.com>
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
This commit is contained in:
Joe Hershberger 2018-06-26 12:37:59 +03:00 committed by Tom Rini
parent 94905e1db8
commit 3925b2ac97
1 changed files with 15 additions and 9 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,14 +1427,21 @@ int fw_env_open(struct env_opts *opts)
} }
dev_current = 0; dev_current = 0;
if (flash_io(O_RDONLY)) {
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 {
ret = -EIO; ret = -EIO;
goto open_cleanup; goto open_cleanup;
} }
crc0 = crc32(0, (uint8_t *)environment.data, ENV_SIZE);
crc0_ok = (crc0 == *environment.crc);
if (!have_redund_env) { if (!have_redund_env) {
if (!crc0_ok) { if (!crc0_ok) {
fprintf(stderr, fprintf(stderr,
@ -1462,8 +1469,10 @@ int fw_env_open(struct env_opts *opts)
*/ */
environment.image = addr1; environment.image = addr1;
if (flash_io(O_RDONLY)) { if (flash_io(O_RDONLY)) {
ret = -EIO; crc1_ok = 0;
goto open_cleanup; } else {
crc1 = crc32(0, (uint8_t *)redundant->data, ENV_SIZE);
crc1_ok = (crc1 == redundant->crc);
} }
/* Check flag scheme compatibility */ /* Check flag scheme compatibility */
@ -1489,9 +1498,6 @@ int fw_env_open(struct env_opts *opts)
goto open_cleanup; goto open_cleanup;
} }
crc1 = crc32(0, (uint8_t *)redundant->data, ENV_SIZE);
crc1_ok = (crc1 == redundant->crc);
flag1 = redundant->flags; flag1 = redundant->flags;
if (crc0_ok && !crc1_ok) { if (crc0_ok && !crc1_ok) {