diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-22 09:13:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-22 09:13:50 -0500 |
| commit | 1e104ac61f039537c7b683676414b7b7ededc1a8 (patch) | |
| tree | ee87cb01d104057c94b32ae95c012c69d415b362 /tools/env/fw_env.c | |
| parent | 643366bcd5e32878a951e39b8b553b794695b026 (diff) | |
| parent | c62e6142b95045621fc229d34f40bd8d0e41160a (diff) | |
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-net
- Fix phy_connect() call in two drivers
- fw_setenv bugfix
Diffstat (limited to 'tools/env/fw_env.c')
| -rw-r--r-- | tools/env/fw_env.c | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 30b5a190ab9..381739d28df 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -112,6 +112,7 @@ struct environment { unsigned char *flags; char *data; enum flag_scheme flag_scheme; + int dirty; }; static struct environment environment = { @@ -506,6 +507,9 @@ int fw_env_flush(struct env_opts *opts) if (!opts) opts = &default_opts; + if (!environment.dirty) + return 0; + /* * Update CRC */ @@ -551,7 +555,8 @@ int fw_env_write(char *name, char *value) deleting = (oldval && !(value && strlen(value))); creating = (!oldval && (value && strlen(value))); - overwriting = (oldval && (value && strlen(value))); + overwriting = (oldval && (value && strlen(value) && + strcmp(oldval, value))); /* check for permission */ if (deleting) { @@ -591,6 +596,7 @@ int fw_env_write(char *name, char *value) /* Nothing to do */ return 0; + environment.dirty = 1; if (deleting || overwriting) { if (*++nxt == '\0') { *env = '\0'; @@ -1440,6 +1446,7 @@ int fw_env_open(struct env_opts *opts) "Warning: Bad CRC, using default environment\n"); memcpy(environment.data, default_environment, sizeof(default_environment)); + environment.dirty = 1; } } else { flag0 = *environment.flags; @@ -1493,6 +1500,16 @@ int fw_env_open(struct env_opts *opts) crc1_ok = (crc1 == redundant->crc); flag1 = redundant->flags; + /* + * environment.data still points to ((struct + * env_image_redundant *)addr0)->data. If the two + * environments differ, or one has bad crc, force a + * write-out by marking the environment dirty. + */ + if (memcmp(environment.data, redundant->data, ENV_SIZE) || + !crc0_ok || !crc1_ok) + environment.dirty = 1; + if (crc0_ok && !crc1_ok) { dev_current = 0; } else if (!crc0_ok && crc1_ok) { @@ -1502,6 +1519,7 @@ int fw_env_open(struct env_opts *opts) "Warning: Bad CRC, using default environment\n"); memcpy(environment.data, default_environment, sizeof(default_environment)); + environment.dirty = 1; dev_current = 0; } else { switch (environment.flag_scheme) { |