Merge with http://www.denx.de/git/u-boot.git

diff --cc README
Simple merge

diff --cc board/delta/nand.c
Simple merge

diff --cc common/env_nand.c
index 2e1bfa666596b2531852ee46cc1ac69712404f2e,dd27f7b629cdaf6ca813f6d19d89e256de0205e5..a6af74a75cf7c50225f41934ccf0c4b9aa72b98e
--- 1/common/env_nand.c
--- 2/common/env_nand.c
+++ b/common/env_nand.c
@@@ -108,45 -110,10 +108,47 @@@ int env_init(void
   * The legacy NAND code saved the environment in the first NAND device i.e.,
   * nand_dev_desc + 0. This is also the behaviour using the new NAND code.
   */
-       int total, ret = 0;
 +#ifdef CFG_ENV_OFFSET_REDUND
 +int saveenv(void)
 +{
++      ulong total;
++      int ret = 0;
 +
 +      DECLARE_GLOBAL_DATA_PTR;
 +
 +      env_ptr->flags++;
 +      total = CFG_ENV_SIZE;
 +
 +      if(gd->env_valid == 1) {
 +              puts ("Erasing redundant Nand...");
 +              if (nand_erase(&nand_info[0],
 +                             CFG_ENV_OFFSET_REDUND, CFG_ENV_SIZE))
 +                      return 1;
 +              puts ("Writing to redundant Nand... ");
 +              ret = nand_write(&nand_info[0], CFG_ENV_OFFSET_REDUND, &total,
 +                               (u_char*) env_ptr);
 +      } else {
 +              puts ("Erasing Nand...");
 +              if (nand_erase(&nand_info[0],
 +                             CFG_ENV_OFFSET, CFG_ENV_SIZE))
 +                      return 1;
 +
 +              puts ("Writing to Nand... ");
 +              ret = nand_write(&nand_info[0], CFG_ENV_OFFSET, &total,
 +                               (u_char*) env_ptr);
 +      }
 +      if (ret || total != CFG_ENV_SIZE)
 +              return 1;
 +
 +      puts ("done\n");
 +      gd->env_valid = (gd->env_valid == 2 ? 1 : 2);
 +      return ret;
 +}
 +#else /* ! CFG_ENV_OFFSET_REDUND */
  int saveenv(void)
  {
-       int total, ret = 0;
+       ulong total;
+       int ret = 0;
  
        puts ("Erasing Nand...");
        if (nand_erase(&nand_info[0], CFG_ENV_OFFSET, CFG_ENV_SIZE))
@@@ -162,64 -128,9 +163,65 @@@
        puts ("done\n");
        return ret;
  }
 +#endif /* CFG_ENV_OFFSET_REDUND */
  #endif /* CMD_SAVEENV */
  
-       int crc1_ok = 0, crc2_ok = 0, total;
 +#ifdef CFG_ENV_OFFSET_REDUND
 +void env_relocate_spec (void)
 +{
 +#if !defined(ENV_IS_EMBEDDED)
++      ulong total;
++      int crc1_ok = 0, crc2_ok = 0;
 +      env_t *tmp_env1, *tmp_env2;
 +
 +      DECLARE_GLOBAL_DATA_PTR;
 +
 +      total = CFG_ENV_SIZE;
 +
 +      tmp_env1 = (env_t *) malloc(CFG_ENV_SIZE);
 +      tmp_env2 = (env_t *) malloc(CFG_ENV_SIZE);
 +
 +      nand_read(&nand_info[0], CFG_ENV_OFFSET, &total,
 +                (u_char*) tmp_env1);
 +      nand_read(&nand_info[0], CFG_ENV_OFFSET_REDUND, &total,
 +                (u_char*) tmp_env2);
 +
 +      crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc);
 +      crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);
  
 +      if(!crc1_ok && !crc2_ok)
 +              return use_default();
 +      else if(crc1_ok && !crc2_ok)
 +              gd->env_valid = 1;
 +      else if(!crc1_ok && crc2_ok)
 +              gd->env_valid = 2;
 +      else {
 +              /* both ok - check serial */
 +              if(tmp_env1->flags == 255 && tmp_env2->flags == 0)
 +                      gd->env_valid = 2;
 +              else if(tmp_env2->flags == 255 && tmp_env1->flags == 0)
 +                      gd->env_valid = 1;
 +              else if(tmp_env1->flags > tmp_env2->flags)
 +                      gd->env_valid = 1;
 +              else if(tmp_env2->flags > tmp_env1->flags)
 +                      gd->env_valid = 2;
 +              else /* flags are equal - almost impossible */
 +                      gd->env_valid = 1;
 +
 +      }
 +
 +      free(env_ptr);
 +      if(gd->env_valid == 1) {
 +              env_ptr = tmp_env1;
 +              free(tmp_env2);
 +      } else {
 +              env_ptr = tmp_env2;
 +              free(tmp_env1);
 +      }
 +
 +#endif /* ! ENV_IS_EMBEDDED */
 +}
 +#else /* ! CFG_ENV_OFFSET_REDUND */
  /*
   * The legacy NAND code saved the environment in the first NAND device i.e.,
   * nand_dev_desc + 0. This is also the behaviour using the new NAND code.