summaryrefslogtreecommitdiff
path: root/common/env_sf.c
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-07-24 17:51:27 -0400
committerWolfgang Denk <wd@denx.de>2009-08-09 22:41:42 +0200
commit18304f7675e84252965b4e24cba279071f1da472 (patch)
tree9ddc4f54c1da582300862a6bfbb0e47f1267f28b /common/env_sf.c
parentbedd8403f77f790e9876578885eab1200ba2f8d8 (diff)
downloadu-boot-imx-18304f7675e84252965b4e24cba279071f1da472.zip
u-boot-imx-18304f7675e84252965b4e24cba279071f1da472.tar.gz
u-boot-imx-18304f7675e84252965b4e24cba279071f1da472.tar.bz2
env: kill off default_environment_size
The only environment type that uses this variable is spi flash, and that is only because it is reimplementing the common set_default_env() function. So fix the spi flash code and kill off the default_environment_size in the process. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common/env_sf.c')
-rw-r--r--common/env_sf.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/common/env_sf.c b/common/env_sf.c
index 2f52e25..6575b6d 100644
--- a/common/env_sf.c
+++ b/common/env_sf.c
@@ -47,7 +47,6 @@ DECLARE_GLOBAL_DATA_PTR;
/* references to names in env_common.c */
extern uchar default_environment[];
-extern int default_environment_size;
char * env_name_spec = "SPI Flash";
env_t *env_ptr;
@@ -143,16 +142,7 @@ err_probe:
err_crc:
puts("*** Warning - bad CRC, using default environment\n\n");
- if (default_environment_size > CONFIG_ENV_SIZE) {
- gd->env_valid = 0;
- 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();
}
int env_init(void)