Minor cleanup

[u-boot] / common / env_flash.c

diff --git a/common/env_flash.c b/common/env_flash.c
index 4e42c8fee5515fd0db99a6f6ad175f9b6d399b8b..1674b30e118d57c60d1a44684138555417fe34b6 100644 (file)
--- a/common/env_flash.c
+++ b/common/env_flash.c
@@ -35,6 +35,8 @@
 #include <linux/stddef.h>
 #include <malloc.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 #if ((CONFIG_COMMANDS&(CFG_CMD_ENV|CFG_CMD_FLASH)) == (CFG_CMD_ENV|CFG_CMD_FLASH))
 #define CMD_SAVEENV
 #elif defined(CFG_ENV_ADDR_REDUND)
@@ -89,8 +91,6 @@ extern int default_environment_size;
 
 uchar env_get_char_spec (int index)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        return ( *((uchar *)(gd->env_addr + index)) );
 }
 
@@ -98,12 +98,7 @@ uchar env_get_char_spec (int index)
 
 int  env_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
-       int crc1_ok =
-               (crc32(0, flash_addr->data, ENV_SIZE) == flash_addr->crc);
-       int crc2_ok =
-               (crc32(0, flash_addr_new->data, ENV_SIZE) == flash_addr_new->crc);
+       int crc1_ok = 0, crc2_ok = 0;
 
        uchar flag1 = flash_addr->flags;
        uchar flag2 = flash_addr_new->flags;
@@ -112,6 +107,16 @@ 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);
+
        if (crc1_ok && ! crc2_ok) {
                gd->env_addr  = addr1;
                gd->env_valid = 1;
@@ -138,6 +143,9 @@ int  env_init(void)
                gd->env_valid = 2;
        }
 
+#ifdef CONFIG_OMAP2420H4
+bad_flash:
+#endif
        return (0);
 }
 
@@ -193,7 +201,7 @@ int saveenv(void)
        debug (" %08lX ... %08lX ...",
                (ulong)&(flash_addr_new->data),
                sizeof(env_ptr->data)+(ulong)&(flash_addr_new->data));
-       if ((rc = flash_write(env_ptr->data,
+       if ((rc = flash_write((char *)env_ptr->data,
                        (ulong)&(flash_addr_new->data),
                        sizeof(env_ptr->data))) ||
            (rc = flash_write((char *)&(env_ptr->crc),
@@ -251,16 +259,22 @@ Done:
 
 int  env_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
+#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;
-       } else {
-               gd->env_addr  = (ulong)&default_environment[0];
-               gd->env_valid = 0;
+               return(0);
        }
-
+#ifdef CONFIG_OMAP2420H4
+bad_flash:
+#endif
+       gd->env_addr  = (ulong)&default_environment[0];
+       gd->env_valid = 0;
        return (0);
 }
 
@@ -275,7 +289,7 @@ int saveenv(void)
        ulong   flash_offset;
        uchar   env_buffer[CFG_ENV_SECT_SIZE];
 #else
-       uchar *env_buffer = (char *)env_ptr;
+       uchar *env_buffer = (uchar *)env_ptr;
 #endif /* CFG_ENV_SECT_SIZE */
        int rcode = 0;
 
@@ -321,7 +335,7 @@ int saveenv(void)
                return 1;
 
        puts ("Writing to Flash... ");
-       rc = flash_write(env_buffer, flash_sect_addr, len);
+       rc = flash_write((char *)env_buffer, flash_sect_addr, len);
        if (rc != 0) {
                flash_perror (rc);
                rcode = 1;
@@ -342,8 +356,6 @@ void env_relocate_spec (void)
 {
 #if !defined(ENV_IS_EMBEDDED) || defined(CFG_ENV_ADDR_REDUND)
 #ifdef CFG_ENV_ADDR_REDUND
-       DECLARE_GLOBAL_DATA_PTR;
-
        if (gd->env_addr != (ulong)&(flash_addr->data)) {
                env_t * etmp = flash_addr;
                ulong ltmp = end_addr;