diff options
| author | Stefan Roese <sr@denx.de> | 2007-09-02 14:02:19 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2007-09-02 14:02:19 +0200 |
| commit | 1d1ab638f8b5961e4972d29394e573afb39667be (patch) | |
| tree | 36fa9e8b01e05323e93a55a2cdc592fe69b5396c /common/env_flash.c | |
| parent | 81b73dec16fd1227369a191e725e10044a9d56b8 (diff) | |
| parent | 60174746c668b309378a91488dded898e9553eae (diff) | |
| download | u-boot-imx-1d1ab638f8b5961e4972d29394e573afb39667be.zip u-boot-imx-1d1ab638f8b5961e4972d29394e573afb39667be.tar.gz u-boot-imx-1d1ab638f8b5961e4972d29394e573afb39667be.tar.bz2 | |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'common/env_flash.c')
| -rw-r--r-- | common/env_flash.c | 20 |
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); |