karo: merge with Ka-Ro specific tree for secure boot support

[karo-tx-uboot.git] / common / env_nand.c

diff --git a/common/env_nand.c b/common/env_nand.c
index 9c9bb82c0faf81f3d6d6295f99ecfcfd3a1cea2b..dc457f959d708e98cba41b8714d340748f687c4d 100644 (file)
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -44,8 +44,6 @@ char *env_name_spec = "NAND";
 env_t *env_ptr = &environment;
 #elif defined(CONFIG_NAND_ENV_DST)
 env_t *env_ptr = (env_t *)CONFIG_NAND_ENV_DST;
-#else /* ! ENV_IS_EMBEDDED */
-env_t *env_ptr;
 #endif /* ENV_IS_EMBEDDED */
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -350,7 +348,9 @@ void env_relocate_spec(void)
                        gd->env_valid = 1;
        }
 
+#ifdef CONFIG_NAND_ENV_DST
        free(env_ptr);
+#endif
 
        if (gd->env_valid == 1)
                ep = tmp_env1;