colibri_imx6: fix video stdout in default environment

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

diff --git a/env/common.c b/env/common.c
index bd340fe9d52d7bdfb62d68c83ceca6954ccf27ae..088b2aebb42c531b3a026320e60a502d250342ba 100644 (file)
--- a/env/common.c
+++ b/env/common.c
@@ -8,12 +8,17 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
-#include <environment.h>
+#include <env.h>
+#include <env_internal.h>
+#include <log.h>
+#include <sort.h>
 #include <linux/stddef.h>
 #include <search.h>
 #include <errno.h>
 #include <malloc.h>
+#include <u-boot/crc.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -23,10 +28,7 @@ DECLARE_GLOBAL_DATA_PTR;
 #include <env_default.h>
 
 struct hsearch_data env_htab = {
-#if CONFIG_IS_ENABLED(ENV_SUPPORT)
-       /* defined in flags.c, only compile with ENV_SUPPORT */
        .change_ok = env_flags_validate,
-#endif
 };
 
 /*
@@ -61,7 +63,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 +93,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 +119,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 +132,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 +157,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 +173,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;
@@ -228,17 +230,15 @@ void env_relocate(void)
 #if defined(CONFIG_NEEDS_MANUAL_RELOC)
        env_reloc();
        env_fix_drivers();
-
-       if (env_htab.change_ok)
-               env_htab.change_ok += gd->reloc_off;
+       env_htab.change_ok += gd->reloc_off;
 #endif
        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 +249,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) {