bootm: Require boot function only if it is about to be used

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

diff --git a/common/env_common.c b/common/env_common.c
index 067fe3f4c1a846fe12541e4d7282f25704e756d6..906b41fccada86dc41d58d23ad42f74e7d5476b2 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -40,7 +40,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #include <env_default.h>
 
 struct hsearch_data env_htab = {
-       .change_ok = env_change_ok,
+       .change_ok = env_flags_validate,
 };
 
 static uchar __env_get_char_spec(int index)
@@ -95,6 +95,24 @@ int getenv_yesno(const char *var)
                1 : 0;
 }
 
+/*
+ * Look up the variable from the default environment
+ */
+char *getenv_default(const char *name)
+{
+       char *ret_val;
+       unsigned long really_valid = gd->env_valid;
+       unsigned long real_gd_flags = gd->flags;
+
+       /* Pretend that the image is bad. */
+       gd->flags &= ~GD_FLG_ENV_READY;
+       gd->env_valid = 0;
+       ret_val = getenv(name);
+       gd->env_valid = really_valid;
+       gd->flags = real_gd_flags;
+       return ret_val;
+}
+
 void set_default_env(const char *s)
 {
        int flags = 0;