cpuat91: convert to new at91 soc architecture

[karo-tx-uboot.git] / common / env_nand.c

diff --git a/common/env_nand.c b/common/env_nand.c
index 76569da0fef2169172e5977ebf4ac84bece3388c..d38bcca1b81119c482ab49b119fb8ca2aff1b40a 100644 (file)
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -38,6 +38,7 @@
 #include <linux/stddef.h>
 #include <malloc.h>
 #include <nand.h>
+#include <asm/errno.h>
 
 #if defined(CONFIG_CMD_SAVEENV) && defined(CONFIG_CMD_NAND)
 #define CMD_SAVEENV
@@ -49,28 +50,21 @@
 #error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE
 #endif
 
-#ifdef CONFIG_INFERNO
-#error CONFIG_INFERNO not supported yet
-#endif
-
 #ifndef CONFIG_ENV_RANGE
 #define CONFIG_ENV_RANGE       CONFIG_ENV_SIZE
 #endif
 
-int nand_legacy_rw (struct nand_chip* nand, int cmd,
-           size_t start, size_t len,
-           size_t * retlen, u_char * buf);
-
 /* references to names in env_common.c */
 extern uchar default_environment[];
-extern int default_environment_size;
 
 char * env_name_spec = "NAND";
 
 
-#ifdef ENV_IS_EMBEDDED
+#if defined(ENV_IS_EMBEDDED)
 extern uchar environment[];
 env_t *env_ptr = (env_t *)(&environment[0]);
+#elif defined(CONFIG_NAND_ENV_DST)
+env_t *env_ptr = (env_t *)CONFIG_NAND_ENV_DST;
 #else /* ! ENV_IS_EMBEDDED */
 env_t *env_ptr = 0;
 #endif /* ENV_IS_EMBEDDED */
@@ -102,26 +96,33 @@ uchar env_get_char_spec (int index)
  */
 int env_init(void)
 {
-#if defined(ENV_IS_EMBEDDED)
-       size_t total;
+#if defined(ENV_IS_EMBEDDED) || defined(CONFIG_NAND_ENV_DST)
        int crc1_ok = 0, crc2_ok = 0;
-       env_t *tmp_env1, *tmp_env2;
+       env_t *tmp_env1;
 
-       total = CONFIG_ENV_SIZE;
+#ifdef CONFIG_ENV_OFFSET_REDUND
+       env_t *tmp_env2;
 
-       tmp_env1 = env_ptr;
        tmp_env2 = (env_t *)((ulong)env_ptr + CONFIG_ENV_SIZE);
+       crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc);
+#endif
+
+       tmp_env1 = env_ptr;
 
        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)
+       if (!crc1_ok && !crc2_ok) {
+               gd->env_addr  = 0;
                gd->env_valid = 0;
-       else if(crc1_ok && !crc2_ok)
+
+               return 0;
+       } else if (crc1_ok && !crc2_ok) {
                gd->env_valid = 1;
-       else if(!crc1_ok && crc2_ok)
+       }
+#ifdef CONFIG_ENV_OFFSET_REDUND
+       else if (!crc1_ok && crc2_ok) {
                gd->env_valid = 2;
-       else {
+       } else {
                /* both ok - check serial */
                if(tmp_env1->flags == 255 && tmp_env2->flags == 0)
                        gd->env_valid = 2;
@@ -135,14 +136,19 @@ int env_init(void)
                        gd->env_valid = 1;
        }
 
+       if (gd->env_valid == 2)
+               env_ptr = tmp_env2;
+       else
+#endif
        if (gd->env_valid == 1)
                env_ptr = tmp_env1;
-       else if (gd->env_valid == 2)
-               env_ptr = tmp_env2;
-#else /* ENV_IS_EMBEDDED */
+
+       gd->env_addr = (ulong)env_ptr->data;
+
+#else /* ENV_IS_EMBEDDED || CONFIG_NAND_ENV_DST */
        gd->env_addr  = (ulong)&default_environment[0];
        gd->env_valid = 1;
-#endif /* ENV_IS_EMBEDDED */
+#endif /* ENV_IS_EMBEDDED || CONFIG_NAND_ENV_DST */
 
        return (0);
 }
@@ -183,12 +189,10 @@ int writeenv(size_t offset, u_char *buf)
 #ifdef CONFIG_ENV_OFFSET_REDUND
 int saveenv(void)
 {
-       size_t total;
        int ret = 0;
        nand_erase_options_t nand_erase_options;
 
        env_ptr->flags++;
-       total = CONFIG_ENV_SIZE;
 
        nand_erase_options.length = CONFIG_ENV_RANGE;
        nand_erase_options.quiet = 0;
@@ -226,7 +230,6 @@ int saveenv(void)
 #else /* ! CONFIG_ENV_OFFSET_REDUND */
 int saveenv(void)
 {
-       size_t total;
        int ret = 0;
        nand_erase_options_t nand_erase_options;
 
@@ -243,7 +246,6 @@ int saveenv(void)
                return 1;
 
        puts ("Writing to Nand... ");
-       total = CONFIG_ENV_SIZE;
        if (writeenv(CONFIG_ENV_OFFSET, (u_char *) env_ptr)) {
                puts("FAILED!\n");
                return 1;
@@ -264,6 +266,8 @@ int readenv (size_t offset, u_char * buf)
        u_char *char_ptr;
 
        blocksize = nand_info[0].erasesize;
+       if (!blocksize)
+               return 1;
        len = min(blocksize, CONFIG_ENV_SIZE);
 
        while (amount_loaded < CONFIG_ENV_SIZE && offset < end) {
@@ -283,19 +287,55 @@ int readenv (size_t offset, u_char * buf)
        return 0;
 }
 
+#ifdef CONFIG_ENV_OFFSET_OOB
+int get_nand_env_oob(nand_info_t *nand, unsigned long *result)
+{
+       struct mtd_oob_ops ops;
+       uint32_t oob_buf[ENV_OFFSET_SIZE/sizeof(uint32_t)];
+       int ret;
+
+       ops.datbuf = NULL;
+       ops.mode = MTD_OOB_AUTO;
+       ops.ooboffs = 0;
+       ops.ooblen = ENV_OFFSET_SIZE;
+       ops.oobbuf = (void *) oob_buf;
+
+       ret = nand->read_oob(nand, ENV_OFFSET_SIZE, &ops);
+       if (ret) {
+               printf("error reading OOB block 0\n");
+               return ret;
+       }
+
+       if (oob_buf[0] == ENV_OOB_MARKER) {
+               *result = oob_buf[1] * nand->erasesize;
+       } else if (oob_buf[0] == ENV_OOB_MARKER_OLD) {
+               *result = oob_buf[1];
+       } else {
+               printf("No dynamic environment marker in OOB block 0\n");
+               return -ENOENT;
+       }
+
+       return 0;
+}
+#endif
+
 #ifdef CONFIG_ENV_OFFSET_REDUND
 void env_relocate_spec (void)
 {
 #if !defined(ENV_IS_EMBEDDED)
-       size_t total;
        int crc1_ok = 0, crc2_ok = 0;
        env_t *tmp_env1, *tmp_env2;
 
-       total = CONFIG_ENV_SIZE;
-
        tmp_env1 = (env_t *) malloc(CONFIG_ENV_SIZE);
        tmp_env2 = (env_t *) malloc(CONFIG_ENV_SIZE);
 
+       if ((tmp_env1 == NULL) || (tmp_env2 == NULL)) {
+               puts("Can't allocate buffers for environment\n");
+               free (tmp_env1);
+               free (tmp_env2);
+               return use_default();
+       }
+
        if (readenv(CONFIG_ENV_OFFSET, (u_char *) tmp_env1))
                puts("No Valid Environment Area Found\n");
        if (readenv(CONFIG_ENV_OFFSET_REDUND, (u_char *) tmp_env2))
@@ -348,6 +388,17 @@ void env_relocate_spec (void)
 #if !defined(ENV_IS_EMBEDDED)
        int ret;
 
+#if defined(CONFIG_ENV_OFFSET_OOB)
+       ret = get_nand_env_oob(&nand_info[0], &nand_env_oob_offset);
+       /* If unable to read environment offset from NAND OOB then fall through
+        * to the normal environment reading code below
+        */
+       if (!ret)
+               printf("Found Environment offset in OOB..\n");
+       else
+               return use_default();
+#endif
+
        ret = readenv(CONFIG_ENV_OFFSET, (u_char *) env_ptr);
        if (ret)
                return use_default();