README: sh: Drop CONFIG_SYS_I2C_SH_BASE5

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

diff --git a/common/env_common.c b/common/env_common.c
index 3b979bcb9869996d14937aeba5c2856a7147ae3a..560cad02476404fdde6e4f0b4dff5f07a7ec22d1 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -118,11 +118,12 @@ void set_default_env(const char *s)
        }
 
        if (himport_r(&env_htab, (char *)default_environment,
-                       sizeof(default_environment), '\0', flags,
+                       sizeof(default_environment), '\0', flags, 0,
                        0, NULL) == 0)
                error("Environment import failed: errno = %d\n", errno);
 
        gd->flags |= GD_FLG_ENV_READY;
+       gd->flags |= GD_FLG_ENV_DEFAULT;
 }
 
 
@@ -135,7 +136,7 @@ int set_default_vars(int nvars, char * const vars[])
         */
        return himport_r(&env_htab, (const char *)default_environment,
                                sizeof(default_environment), '\0',
-                               H_NOCLEAR | H_INTERACTIVE, nvars, vars);
+                               H_NOCLEAR | H_INTERACTIVE, 0, nvars, vars);
 }
 
 #ifdef CONFIG_ENV_AES
@@ -144,7 +145,7 @@ int set_default_vars(int nvars, char * const vars[])
  * env_aes_cbc_get_key() - Get AES-128-CBC key for the environment
  *
  * This function shall return 16-byte array containing AES-128 key used
- * to encrypt and decrypt the environment. This function must be overriden
+ * to encrypt and decrypt the environment. This function must be overridden
  * by the implementer as otherwise the environment encryption will not
  * work.
  */
@@ -212,7 +213,7 @@ int env_import(const char *buf, int check)
                return ret;
        }
 
-       if (himport_r(&env_htab, (char *)ep->data, ENV_SIZE, '\0', 0,
+       if (himport_r(&env_htab, (char *)ep->data, ENV_SIZE, '\0', 0, 0,
                        0, NULL)) {
                gd->flags |= GD_FLG_ENV_READY;
                return 1;