aboutsummaryrefslogtreecommitdiff
path: root/common/env_nand.c
diff options
context:
space:
mode:
authorHarald Welte <laforge@gnumonks.org>2008-07-07 15:40:39 +0800
committerWolfgang Denk <wd@denx.de>2008-07-10 00:28:20 +0200
commit5bb12dbd7ae03189b6c13d8737b5a1b37c3df698 (patch)
tree4e761b4b8bcf58c14e331640242cb9ed12ceb91d /common/env_nand.c
parentc3bf1ad7baa1b0dd989dedc260b7098b6089ae05 (diff)
downloadu-boot-linaro-natty-5bb12dbd7ae03189b6c13d8737b5a1b37c3df698.tar.gz
Remove code duplication for setting the default environment
common/env_common.c (default_env): new function that resets the environment to the default value common/env_common.c (env_relocate): use default_env instead of own copy common/env_nand.c (env_relocate_spec): use default_env instead of own copy include/environment.h: added default_env prototype Signed-off-by: Werner Almesberger <werner@openmoko.org> Signed-off-by: Harald Welte <laforge@openmoko.org>
Diffstat (limited to 'common/env_nand.c')
-rw-r--r--common/env_nand.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/common/env_nand.c b/common/env_nand.c
index 895401770..3890b8494 100644
--- 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