Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot

[people/ms/u-boot.git] / env / common.c

diff --git a/env/common.c b/env/common.c
index 842c0f7fd14c591f1834aec3e347c33cb3741434..688d5ab4c8985434288bc090d5797b95462eb96d 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;
@@ -67,7 +53,7 @@ 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);
+       ret_val = env_get(name);
        gd->env_valid = really_valid;
        gd->flags = real_gd_flags;
        return ret_val;
@@ -294,7 +280,7 @@ void env_relocate(void)
                set_default_env("!bad CRC");
 #endif
        } else {
-               env_relocate_spec();
+               env_load();
        }
 }