Merge branch 'master' of git://git.denx.de/u-boot-video

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

diff --git a/common/env_onenand.c b/common/env_onenand.c
index 5888f75d895ec43b71fc3596380d69b75616feff..e8bde37266adb9553e192cea11c2341b58bf2103 100644 (file)
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -1,5 +1,8 @@
 /*
- * (C) Copyright 2005-2007 Samsung Electronics
+ * (C) Copyright 2010 DENX Software Engineering
+ * Wolfgang Denk <wd@denx.de>
+ *
+ * (C) Copyright 2005-2009 Samsung Electronics
  * Kyungmin Park <kyungmin.park@samsung.com>
  *
  * See file CREDITS for list of people who contributed to this
@@ -22,98 +25,102 @@
  */
 
 #include <common.h>
-
-#if defined(CFG_ENV_IS_IN_ONENAND)     /* Environment is in OneNAND */
-
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
 #include <malloc.h>
+#include <search.h>
+#include <errno.h>
+#include <onenand_uboot.h>
 
-#include <linux/mtd/compat.h>
+#include <linux/compat.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
 
-extern struct mtd_info onenand_mtd;
-extern struct onenand_chip onenand_chip;
-
-/* References to names in env_common.c */
-extern uchar default_environment[];
-
-#define ONENAND_ENV_SIZE(mtd)  (mtd.oobblock - ENV_HEADER_SIZE)
-
 char *env_name_spec = "OneNAND";
 
-#ifdef ENV_IS_EMBEDDED
-extern uchar environment[];
-env_t *env_ptr = (env_t *) (&environment[0]);
-#else /* ! ENV_IS_EMBEDDED */
-static unsigned char onenand_env[MAX_ONENAND_PAGESIZE];
-env_t *env_ptr = (env_t *) onenand_env;
-#endif /* ENV_IS_EMBEDDED */
-
-uchar env_get_char_spec(int index)
-{
-       DECLARE_GLOBAL_DATA_PTR;
+#define ONENAND_MAX_ENV_SIZE   CONFIG_ENV_SIZE
+#define ONENAND_ENV_SIZE(mtd)  (ONENAND_MAX_ENV_SIZE - ENV_HEADER_SIZE)
 
-       return (*((uchar *) (gd->env_addr + index)));
-}
+DECLARE_GLOBAL_DATA_PTR;
 
 void env_relocate_spec(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-       unsigned long env_addr;
-       int use_default = 0;
+       struct mtd_info *mtd = &onenand_mtd;
+#ifdef CONFIG_ENV_ADDR_FLEX
+       struct onenand_chip *this = &onenand_chip;
+#endif
+       int rc;
        size_t retlen;
+#ifdef ENV_IS_EMBEDDED
+       char *buf = (char *)&environment;
+#else
+       loff_t env_addr = CONFIG_ENV_ADDR;
+       char onenand_env[ONENAND_MAX_ENV_SIZE];
+       char *buf = (char *)&onenand_env[0];
+#endif /* ENV_IS_EMBEDDED */
 
-       env_addr = CFG_ENV_ADDR;
-       env_addr -= (unsigned long)onenand_chip.base;
-
+#ifndef ENV_IS_EMBEDDED
+# ifdef CONFIG_ENV_ADDR_FLEX
+       if (FLEXONENAND(this))
+               env_addr = CONFIG_ENV_ADDR_FLEX;
+# endif
        /* Check OneNAND exist */
-       if (onenand_mtd.oobblock)
+       if (mtd->writesize)
                /* Ignore read fail */
-               onenand_read(&onenand_mtd, env_addr, onenand_mtd.oobblock,
-                            &retlen, (u_char *) env_ptr);
+               mtd_read(mtd, env_addr, ONENAND_MAX_ENV_SIZE,
+                               &retlen, (u_char *)buf);
        else
-               onenand_mtd.oobblock = MAX_ONENAND_PAGESIZE;
-
-       if (crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd)) !=
-           env_ptr->crc)
-               use_default = 1;
-
-       if (use_default) {
-               memcpy(env_ptr->data, default_environment,
-                      ONENAND_ENV_SIZE(onenand_mtd));
-               env_ptr->crc =
-                   crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd));
-       }
+               mtd->writesize = MAX_ONENAND_PAGESIZE;
+#endif /* !ENV_IS_EMBEDDED */
 
-       gd->env_addr = (ulong) & env_ptr->data;
-       gd->env_valid = 1;
+       rc = env_import(buf, 1);
+       if (rc)
+               gd->env_valid = 1;
 }
 
 int saveenv(void)
 {
-       unsigned long env_addr = CFG_ENV_ADDR;
-       struct erase_info instr;
-       size_t retlen;
-
-       instr.len = CFG_ENV_SIZE;
+       env_t   env_new;
+       ssize_t len;
+       char    *res;
+       struct mtd_info *mtd = &onenand_mtd;
+#ifdef CONFIG_ENV_ADDR_FLEX
+       struct onenand_chip *this = &onenand_chip;
+#endif
+       loff_t  env_addr = CONFIG_ENV_ADDR;
+       size_t  retlen;
+       struct erase_info instr = {
+               .callback       = NULL,
+       };
+
+       res = (char *)&env_new.data;
+       len = hexport_r(&env_htab, '\0', 0, &res, ENV_SIZE, 0, NULL);
+       if (len < 0) {
+               error("Cannot export environment: errno = %d\n", errno);
+               return 1;
+       }
+       env_new.crc = crc32(0, env_new.data, ENV_SIZE);
+
+       instr.len = CONFIG_ENV_SIZE;
+#ifdef CONFIG_ENV_ADDR_FLEX
+       if (FLEXONENAND(this)) {
+               env_addr = CONFIG_ENV_ADDR_FLEX;
+               instr.len = CONFIG_ENV_SIZE_FLEX;
+               instr.len <<= onenand_mtd.eraseregions[0].numblocks == 1 ?
+                               1 : 0;
+       }
+#endif
        instr.addr = env_addr;
-       instr.addr -= (unsigned long)onenand_chip.base;
-       if (onenand_erase(&onenand_mtd, &instr)) {
-               printf("OneNAND: erase failed at 0x%08x\n", env_addr);
+       instr.mtd = mtd;
+       if (mtd_erase(mtd, &instr)) {
+               printf("OneNAND: erase failed at 0x%08llx\n", env_addr);
                return 1;
        }
 
-       /* update crc */
-       env_ptr->crc =
-           crc32(0, env_ptr->data, onenand_mtd.oobblock - ENV_HEADER_SIZE);
-
-       env_addr -= (unsigned long)onenand_chip.base;
-       if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.oobblock, &retlen,
-            (u_char *) env_ptr)) {
-               printf("OneNAND: write failed at 0x%08x\n", instr.addr);
+       if (mtd_write(mtd, env_addr, ONENAND_MAX_ENV_SIZE, &retlen,
+                       (u_char *)&env_new)) {
+               printf("OneNAND: write failed at 0x%llx\n", instr.addr);
                return 2;
        }
 
@@ -122,13 +129,9 @@ int saveenv(void)
 
 int env_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* use default */
-       gd->env_addr = (ulong) & default_environment[0];
+       gd->env_addr = (ulong)&default_environment[0];
        gd->env_valid = 1;
 
        return 0;
 }
-
-#endif /* CFG_ENV_IS_IN_ONENAND */