tizen 2.3.1 release

[platform/kernel/u-boot.git] / common / env_onenand.c

diff --git a/common/env_onenand.c b/common/env_onenand.c
index 4b44632..536e217 100644 (file)
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -5,7 +5,23 @@
  * (C) Copyright 2005-2009 Samsung Electronics
  * Kyungmin Park <kyungmin.park@samsung.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
  */
 
 #include <common.h>
@@ -15,19 +31,33 @@
 #include <malloc.h>
 #include <search.h>
 #include <errno.h>
-#include <onenand_uboot.h>
 
-#include <linux/compat.h>
+#include <linux/mtd/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[];
+
 char *env_name_spec = "OneNAND";
 
-#define ONENAND_MAX_ENV_SIZE   CONFIG_ENV_SIZE
+#define ONENAND_MAX_ENV_SIZE   16384
 #define ONENAND_ENV_SIZE(mtd)  (ONENAND_MAX_ENV_SIZE - ENV_HEADER_SIZE)
 
+#ifdef ENV_IS_EMBEDDED
+extern uchar environment[];
+#endif /* ENV_IS_EMBEDDED */
+
 DECLARE_GLOBAL_DATA_PTR;
 
+uchar env_get_char_spec(int index)
+{
+       return (*((uchar *)(gd->env_addr + index)));
+}
+
 void env_relocate_spec(void)
 {
        struct mtd_info *mtd = &onenand_mtd;
@@ -37,7 +67,7 @@ void env_relocate_spec(void)
        int rc;
        size_t retlen;
 #ifdef ENV_IS_EMBEDDED
-       char *buf = (char *)&environment;
+       char *buf = (char *)&environment[0];
 #else
        loff_t env_addr = CONFIG_ENV_ADDR;
        char onenand_env[ONENAND_MAX_ENV_SIZE];
@@ -52,8 +82,8 @@ void env_relocate_spec(void)
        /* Check OneNAND exist */
        if (mtd->writesize)
                /* Ignore read fail */
-               mtd_read(mtd, env_addr, ONENAND_MAX_ENV_SIZE,
-                               &retlen, (u_char *)buf);
+               mtd->read(mtd, env_addr, ONENAND_MAX_ENV_SIZE,
+                            &retlen, (u_char *)buf);
        else
                mtd->writesize = MAX_ONENAND_PAGESIZE;
 #endif /* !ENV_IS_EMBEDDED */
@@ -79,7 +109,7 @@ int saveenv(void)
        };
 
        res = (char *)&env_new.data;
-       len = hexport_r(&env_htab, '\0', 0, &res, ENV_SIZE, 0, NULL);
+       len = hexport_r(&env_htab, '\0', &res, ENV_SIZE);
        if (len < 0) {
                error("Cannot export environment: errno = %d\n", errno);
                return 1;
@@ -87,6 +117,9 @@ int saveenv(void)
        env_new.crc = crc32(0, env_new.data, ENV_SIZE);
 
        instr.len = CONFIG_ENV_SIZE;
+       if (instr.len < mtd->erasesize)
+               instr.len = ALIGN(instr.len, mtd->erasesize);
+
 #ifdef CONFIG_ENV_ADDR_FLEX
        if (FLEXONENAND(this)) {
                env_addr = CONFIG_ENV_ADDR_FLEX;
@@ -97,13 +130,13 @@ int saveenv(void)
 #endif
        instr.addr = env_addr;
        instr.mtd = mtd;
-       if (mtd_erase(mtd, &instr)) {
+       if (mtd->erase(mtd, &instr)) {
                printf("OneNAND: erase failed at 0x%08llx\n", env_addr);
                return 1;
        }
 
-       if (mtd_write(mtd, env_addr, ONENAND_MAX_ENV_SIZE, &retlen,
-                       (u_char *)&env_new)) {
+       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;
        }
@@ -114,7 +147,7 @@ int saveenv(void)
 int env_init(void)
 {
        /* use default */
-       gd->env_addr = (ulong)&default_environment[0];
+       gd->env_addr = (ulong) & default_environment[0];
        gd->env_valid = 1;
 
        return 0;