diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-12 18:46:07 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-12 18:46:07 -0400 |
| commit | 5939afc9611e8ba4a86b96e67670b765ee27668e (patch) | |
| tree | 369402e0305a7b8f9f905baec6387bfd9683ba71 /env/common.c | |
| parent | d7ae932152ddf58125a05f4eb28596d9b31bdb1e (diff) | |
| parent | ec1fa18561f818bee252da2c331d371ad26037d2 (diff) | |
Merge branch '2019-08-11-master-imports'
- environment cleanup
- HiKey 960 support
- Some PCI fixes
Diffstat (limited to 'env/common.c')
| -rw-r--r-- | env/common.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/env/common.c b/env/common.c index bd340fe9d52..3fb60509dd8 100644 --- a/env/common.c +++ b/env/common.c @@ -9,7 +9,8 @@ #include <common.h> #include <command.h> -#include <environment.h> +#include <env.h> +#include <env_internal.h> #include <linux/stddef.h> #include <search.h> #include <errno.h> @@ -61,7 +62,7 @@ char *env_get_default(const char *name) return ret_val; } -void set_default_env(const char *s, int flags) +void env_set_default(const char *s, int flags) { if (sizeof(default_environment) > ENV_SIZE) { puts("*** Error - default environment is too large\n\n"); @@ -91,7 +92,7 @@ void set_default_env(const char *s, int flags) /* [re]set individual variables to their value in the default environment */ -int set_default_vars(int nvars, char * const vars[], int flags) +int env_set_default_vars(int nvars, char * const vars[], int flags) { /* * Special use-case: import from default environment @@ -117,7 +118,7 @@ int env_import(const char *buf, int check) memcpy(&crc, &ep->crc, sizeof(crc)); if (crc32(0, ep->data, ENV_SIZE) != crc) { - set_default_env("bad CRC", 0); + env_set_default("bad CRC", 0); return -ENOMSG; /* needed for env_load() */ } } @@ -130,7 +131,7 @@ int env_import(const char *buf, int check) pr_err("Cannot import environment: errno = %d\n", errno); - set_default_env("import failed", 0); + env_set_default("import failed", 0); return -EIO; } @@ -155,7 +156,7 @@ int env_import_redund(const char *buf1, int buf1_read_fail, } if (buf1_read_fail && buf2_read_fail) { - set_default_env("bad env area", 0); + env_set_default("bad env area", 0); return -EIO; } else if (!buf1_read_fail && buf2_read_fail) { gd->env_valid = ENV_VALID; @@ -171,7 +172,7 @@ int env_import_redund(const char *buf1, int buf1_read_fail, tmp_env2->crc; if (!crc1_ok && !crc2_ok) { - set_default_env("bad CRC", 0); + env_set_default("bad CRC", 0); return -ENOMSG; /* needed for env_load() */ } else if (crc1_ok && !crc2_ok) { gd->env_valid = ENV_VALID; @@ -235,10 +236,10 @@ void env_relocate(void) if (gd->env_valid == ENV_INVALID) { #if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD) /* Environment not changable */ - set_default_env(NULL, 0); + env_set_default(NULL, 0); #else bootstage_error(BOOTSTAGE_ID_NET_CHECKSUM); - set_default_env("bad CRC", 0); + env_set_default("bad CRC", 0); #endif } else { env_load(); @@ -249,7 +250,7 @@ void env_relocate(void) int env_complete(char *var, int maxv, char *cmdv[], int bufsz, char *buf, bool dollar_comp) { - ENTRY *match; + struct env_entry *match; int found, idx; if (dollar_comp) { |