Richard Please let me know if you have time to test the patch below.
[Test results from other OMAP2420H4 users welcome]
The patch (my ref 20070313_omap2420h4) fixes the build failure caused when the OMAP2420H4 was changed to use CFI flash.
The patch is against commit fdd1d6dcc97c595bd9d598ed3b22a7038781272c of git://www.denx.de/git/u-boot-arm.git
The following changes since commit fdd1d6dcc97c595bd9d598ed3b22a7038781272c: Stefan Roese: Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx-merge-sr
are found in the git repository at:
git://www.denx.de/git/u-boot-arm.git
Peter Pearse: Remove the omap2420h4 specific code from common/env_flash.c.
common/env_flash.c | 19 ------------------- 1 files changed, 0 insertions(+), 19 deletions(-)
Regards
Peter
diff --git a/common/env_flash.c b/common/env_flash.c index 1674b30..0e9f1ae 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 @@ #endif gd->env_valid = 2; }
-#ifdef CONFIG_OMAP2420H4 -bad_flash: -#endif return (0); }
@@ -259,20 +249,11 @@ #else /* ! CFG_ENV_ADDR_REDUND */
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);
---