summaryrefslogtreecommitdiff
path: root/common/env_flash.c
diff options
context:
space:
mode:
authorDirk Behme <dirk.behme@googlemail.com>2007-08-20 07:09:05 +0200
committerWolfgang Denk <wd@denx.de>2007-08-29 02:01:47 +0200
commit9bb8b209ed2058a5756ecbeb544c067e44a42aea (patch)
tree4a8bcfc60c7e3ea3587da94b3255a32601140aaa /common/env_flash.c
parent3bb342fc85d79dbb6b8c2039e7cdcddc82b8d90f (diff)
downloadu-boot-imx-9bb8b209ed2058a5756ecbeb544c067e44a42aea.zip
u-boot-imx-9bb8b209ed2058a5756ecbeb544c067e44a42aea.tar.gz
u-boot-imx-9bb8b209ed2058a5756ecbeb544c067e44a42aea.tar.bz2
Fix compilation error for omap2420h4_config.
omap2420h4 switched to cfi, so remove old (already disabled) flash.c and flash_probe() calls in env_flash.c. Signed-off-by: Dirk Behme <dirk.behme@gmail.com>
Diffstat (limited to 'common/env_flash.c')
-rw-r--r--common/env_flash.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/common/env_flash.c b/common/env_flash.c
index 7a37e55..eccfb62 100644
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -107,13 +107,6 @@ int env_init(void)
ulong addr1 = (ulong)&(flash_addr->data);
ulong addr2 = (ulong)&(flash_addr_new->data);
-#ifdef CONFIG_OMAP2420H4
- int flash_probe(void);
-
- if(flash_probe() == 0)
- goto bad_flash;
-#endif
-
crc1_ok = (crc32(0, flash_addr->data, ENV_SIZE) == flash_addr->crc);
crc2_ok = (crc32(0, flash_addr_new->data, ENV_SIZE) == flash_addr_new->crc);
@@ -143,9 +136,6 @@ int env_init(void)
gd->env_valid = 2;
}
-#ifdef CONFIG_OMAP2420H4
-bad_flash:
-#endif
return (0);
}
@@ -259,20 +249,12 @@ Done:
int env_init(void)
{
-#ifdef CONFIG_OMAP2420H4
- int flash_probe(void);
-
- if(flash_probe() == 0)
- goto bad_flash;
-#endif
if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
gd->env_addr = (ulong)&(env_ptr->data);
gd->env_valid = 1;
return(0);
}
-#ifdef CONFIG_OMAP2420H4
-bad_flash:
-#endif
+
gd->env_addr = (ulong)&default_environment[0];
gd->env_valid = 0;
return (0);