Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / env / common.c

diff --git a/env/common.c b/env/common.c
index 842c0f7fd14c591f1834aec3e347c33cb3741434..70715bb6e7564554c233ca3b9e08b928c7bf3925 100644 (file)
--- a/env/common.c
+++ b/env/common.c
@@ -27,27 +27,13 @@ struct hsearch_data env_htab = {
        .change_ok = env_flags_validate,
 };
 
-__weak uchar env_get_char_spec(int index)
-{
-       return *(uchar *)(gd->env_addr + index);
-}
-
-uchar env_get_char(int index)
-{
-       /* if env is not set up, or crc was bad, use the default environment */
-       if (!gd->env_valid)
-               return default_environment[index];
-       else
-               return env_get_char_spec(index);
-}
-
 /*
  * Read an environment variable as a boolean
  * Return -1 if variable does not exist (default to true)
  */
-int getenv_yesno(const char *var)
+int env_get_yesno(const char *var)
 {
-       char *s = getenv(var);
+       char *s = env_get(var);
 
        if (s == NULL)
                return -1;
@@ -58,7 +44,7 @@ int getenv_yesno(const char *var)
 /*
  * Look up the variable from the default environment
  */
-char *getenv_default(const char *name)
+char *env_get_default(const char *name)
 {
        char *ret_val;
        unsigned long really_valid = gd->env_valid;
@@ -66,8 +52,8 @@ char *getenv_default(const char *name)
 
        /* Pretend that the image is bad. */
        gd->flags &= ~GD_FLG_ENV_READY;
-       gd->env_valid = 0;
-       ret_val = getenv(name);
+       gd->env_valid = ENV_INVALID;
+       ret_val = env_get(name);
        gd->env_valid = really_valid;
        gd->flags = real_gd_flags;
        return ret_val;
@@ -98,7 +84,7 @@ void set_default_env(const char *s)
        if (himport_r(&env_htab, (char *)default_environment,
                        sizeof(default_environment), '\0', flags, 0,
                        0, NULL) == 0)
-               error("Environment import failed: errno = %d\n", errno);
+               pr_err("Environment import failed: errno = %d\n", errno);
 
        gd->flags |= GD_FLG_ENV_READY;
        gd->flags |= GD_FLG_ENV_DEFAULT;
@@ -186,7 +172,7 @@ int env_import(const char *buf, int check)
        /* Decrypt the env if desired. */
        ret = env_aes_cbc_crypt(ep, 0);
        if (ret) {
-               error("Failed to decrypt env!\n");
+               pr_err("Failed to decrypt env!\n");
                set_default_env("!import failed");
                return ret;
        }
@@ -197,7 +183,7 @@ int env_import(const char *buf, int check)
                return 1;
        }
 
-       error("Cannot import environment: errno = %d\n", errno);
+       pr_err("Cannot import environment: errno = %d\n", errno);
 
        set_default_env("!import failed");
 
@@ -224,24 +210,24 @@ int env_import_redund(const char *buf1, const char *buf2)
                set_default_env("!bad CRC");
                return 0;
        } else if (crc1_ok && !crc2_ok) {
-               gd->env_valid = 1;
+               gd->env_valid = ENV_VALID;
        } else if (!crc1_ok && crc2_ok) {
-               gd->env_valid = 2;
+               gd->env_valid = ENV_REDUND;
        } else {
                /* both ok - check serial */
                if (tmp_env1->flags == 255 && tmp_env2->flags == 0)
-                       gd->env_valid = 2;
+                       gd->env_valid = ENV_REDUND;
                else if (tmp_env2->flags == 255 && tmp_env1->flags == 0)
-                       gd->env_valid = 1;
+                       gd->env_valid = ENV_VALID;
                else if (tmp_env1->flags > tmp_env2->flags)
-                       gd->env_valid = 1;
+                       gd->env_valid = ENV_VALID;
                else if (tmp_env2->flags > tmp_env1->flags)
-                       gd->env_valid = 2;
+                       gd->env_valid = ENV_REDUND;
                else /* flags are equal - almost impossible */
-                       gd->env_valid = 1;
+                       gd->env_valid = ENV_VALID;
        }
 
-       if (gd->env_valid == 1)
+       if (gd->env_valid == ENV_VALID)
                ep = tmp_env1;
        else
                ep = tmp_env2;
@@ -261,7 +247,7 @@ int env_export(env_t *env_out)
        res = (char *)env_out->data;
        len = hexport_r(&env_htab, '\0', 0, &res, ENV_SIZE, 0, NULL);
        if (len < 0) {
-               error("Cannot export environment: errno = %d\n", errno);
+               pr_err("Cannot export environment: errno = %d\n", errno);
                return 1;
        }
 
@@ -285,7 +271,7 @@ void env_relocate(void)
        env_reloc();
        env_htab.change_ok += gd->reloc_off;
 #endif
-       if (gd->env_valid == 0) {
+       if (gd->env_valid == ENV_INVALID) {
 #if defined(CONFIG_ENV_IS_NOWHERE) || defined(CONFIG_SPL_BUILD)
                /* Environment not changable */
                set_default_env(NULL);
@@ -294,7 +280,7 @@ void env_relocate(void)
                set_default_env("!bad CRC");
 #endif
        } else {
-               env_relocate_spec();
+               env_load();
        }
 }