diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-10-02 19:05:53 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-10-02 19:05:53 +0200 |
| commit | b90296fc39a33f84bb2b0aa79bf997be495ba791 (patch) | |
| tree | 4ea0d61df25d10fe7552aedf781fd167f4c670fe /common/env_flash.c | |
| parent | e80e585b00fbbab7ad1bf71619741f2c5b029ab7 (diff) | |
| parent | 527c80f012030fa0b51f8594847ec56c9317e9b1 (diff) | |
| download | talos-obmc-uboot-b90296fc39a33f84bb2b0aa79bf997be495ba791.tar.gz talos-obmc-uboot-b90296fc39a33f84bb2b0aa79bf997be495ba791.zip | |
Merge commit 'origin/master'
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 7a37e550de..eccfb62a3b 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); |
