diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-18 08:44:25 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-18 08:44:25 -0400 |
| commit | 6e052b854ac4ed2f2bdd39926c0b704deb3bf522 (patch) | |
| tree | 4277ef551c64391e92d1a57410a09dda59d7a508 /include | |
| parent | 7cb977fd51b4ddcfe385749f035cc768a968edfb (diff) | |
| parent | ecf154423258cb4f0d7ee1ff29d26b0f69f67ac4 (diff) | |
| download | u-boot-6e052b854ac4ed2f2bdd39926c0b704deb3bf522.tar.gz u-boot-6e052b854ac4ed2f2bdd39926c0b704deb3bf522.tar.xz u-boot-6e052b854ac4ed2f2bdd39926c0b704deb3bf522.zip | |
Merge branch '2021-04-16-env-updates'
- SPI Flash ENV improvements / cleanups
- Redundant support for FAT
- Assorted bugfixes
Diffstat (limited to 'include')
| -rw-r--r-- | include/env.h | 2 | ||||
| -rw-r--r-- | include/env_internal.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/env.h b/include/env.h index c15339a93f..b5731e4b9a 100644 --- a/include/env.h +++ b/include/env.h @@ -328,8 +328,6 @@ int env_export(struct environment_s *env_out); * @buf2_read_fail: 0 if buf2 is valid, non-zero if invalid * @return 0 if OK, * -EIO if no environment is valid, - * -EINVAL if read of second entry is good - * -ENOENT if read of first entry is good * -ENOMSG if the CRC was bad */ diff --git a/include/env_internal.h b/include/env_internal.h index 708c833a55..b7bddcb00d 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -211,6 +211,7 @@ struct env_driver { #endif #define ENV_SAVE_PTR(x) (CONFIG_IS_ENABLED(SAVEENV) ? (x) : NULL) +#define ENV_ERASE_PTR(x) (CONFIG_IS_ENABLED(CMD_ERASEENV) ? (x) : NULL) extern struct hsearch_data env_htab; |