Merge branch 'master' of git://git.denx.de/u-boot-mips

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

diff --git a/common/env_common.c b/common/env_common.c
index af59c72e1fd7d502f4899d99e8a1458cc7354d13..6845f8d8d542945f90b005f8fcef1e261092c9c8 100644 (file)
--- a/common/env_common.c
+++ b/common/env_common.c
@@ -123,6 +123,7 @@ void set_default_env(const char *s)
                error("Environment import failed: errno = %d\n", errno);
 
        gd->flags |= GD_FLG_ENV_READY;
+       gd->flags |= GD_FLG_ENV_DEFAULT;
 }
 
 
@@ -139,12 +140,12 @@ int set_default_vars(int nvars, char * const vars[])
 }
 
 #ifdef CONFIG_ENV_AES
-#include <aes.h>
+#include <uboot_aes.h>
 /**
  * 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.
  */
@@ -225,7 +226,7 @@ int env_import(const char *buf, int check)
        return 0;
 }
 
-/* Emport the environment and generate CRC for it. */
+/* Export the environment and generate CRC for it. */
 int env_export(env_t *env_out)
 {
        char *res;