env: mmc/fat/ext4: make sure that the MMC sub-system is initialized before using it

[u-boot] / env / flags.c

diff --git a/env/flags.c b/env/flags.c
index 3c50620cb34df8b527131d3809e4ce5cddf3ff12..4b0ddb6bb85b2c709040295b75b702763b0612a6 100644 (file)
--- a/env/flags.c
+++ b/env/flags.c
@@ -15,7 +15,7 @@
 #include "fw_env.h"
 #include <env_attr.h>
 #include <env_flags.h>
-#define getenv fw_getenv
+#define env_get fw_getenv
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #else
 #include <common.h>
@@ -308,7 +308,7 @@ static inline int env_flags_lookup(const char *flags_list, const char *name,
  */
 enum env_flags_vartype env_flags_get_type(const char *name)
 {
-       const char *flags_list = getenv(ENV_FLAGS_VAR);
+       const char *flags_list = env_get(ENV_FLAGS_VAR);
        char flags[ENV_FLAGS_ATTR_MAX_LEN + 1];
 
        if (env_flags_lookup(flags_list, name, flags))
@@ -325,7 +325,7 @@ enum env_flags_vartype env_flags_get_type(const char *name)
  */
 enum env_flags_varaccess env_flags_get_varaccess(const char *name)
 {
-       const char *flags_list = getenv(ENV_FLAGS_VAR);
+       const char *flags_list = env_get(ENV_FLAGS_VAR);
        char flags[ENV_FLAGS_ATTR_MAX_LEN + 1];
 
        if (env_flags_lookup(flags_list, name, flags))
@@ -426,7 +426,7 @@ void env_flags_init(ENTRY *var_entry)
        int ret = 1;
 
        if (first_call) {
-               flags_list = getenv(ENV_FLAGS_VAR);
+               flags_list = env_get(ENV_FLAGS_VAR);
                first_call = 0;
        }
        /* look in the ".flags" and static for a reference to this variable */
@@ -541,7 +541,7 @@ int env_flags_validate(const ENTRY *item, const char *newval, enum env_op op,
                        return 1;
                } else if (item->flags &
                    ENV_FLAGS_VARACCESS_PREVENT_NONDEF_OVERWR) {
-                       const char *defval = getenv_default(name);
+                       const char *defval = env_get_default(name);
 
                        if (defval == NULL)
                                defval = "";