Merge branch 'master' of git://www.denx.de/git/u-boot-nand-flash

[u-boot] / common / env_nand.c

diff --git a/common/env_nand.c b/common/env_nand.c
index 1fe874a6a116f008f8148f1b3c6c4eb18255da24..104f0856af2a3af7254d06451c47bee4485e89df 100644 (file)
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -363,19 +363,7 @@ void env_relocate_spec (void)
 static void use_default()
 {
        puts ("*** Warning - bad CRC or NAND, using default environment\n\n");
-
-       if (default_environment_size > CFG_ENV_SIZE){
-               puts ("*** Error - default environment is too large\n\n");
-               return;
-       }
-
-       memset (env_ptr, 0, sizeof(env_t));
-       memcpy (env_ptr->data,
-                       default_environment,
-                       default_environment_size);
-       env_ptr->crc = crc32(0, env_ptr->data, ENV_SIZE);
-       gd->env_valid = 1;
-
+       set_default_env();
 }
 #endif