tizen 2.3.1 release

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

diff --git a/common/env_dataflash.c b/common/env_dataflash.c
index b53b87e..1d57079 100644 (file)
--- a/common/env_dataflash.c
+++ b/common/env_dataflash.c
@@ -2,7 +2,20 @@
  * LowLevel function for DataFlash environment support
  * Author : Gilles Gastaldi (Atmel)
  *
- * SPDX-License-Identifier:    GPL-2.0+
+ * 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>
 #include <command.h>
@@ -14,40 +27,34 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-env_t *env_ptr;
+env_t *env_ptr = NULL;
+
+char * env_name_spec = "dataflash";
 
-char *env_name_spec = "dataflash";
+extern int read_dataflash(unsigned long addr, unsigned long size,
+       char *result);
+extern int write_dataflash(unsigned long addr_dest,
+       unsigned long addr_src, unsigned long size);
+extern int AT91F_DataflashInit(void);
+
+extern uchar default_environment[];
 
 uchar env_get_char_spec(int index)
 {
        uchar c;
 
-       read_dataflash(CONFIG_ENV_ADDR + index + offsetof(env_t, data),
+       read_dataflash(CONFIG_ENV_ADDR + index + offsetof(env_t,data),
                        1, (char *)&c);
-       return c;
+       return (c);
 }
 
 void env_relocate_spec(void)
 {
-       ulong crc, new = 0;
-       unsigned off;
        char buf[CONFIG_ENV_SIZE];
 
-       /* Read old CRC */
-       read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, crc),
-                      sizeof(ulong), (char *)&crc);
-
-       /* Read whole environment */
        read_dataflash(CONFIG_ENV_ADDR, CONFIG_ENV_SIZE, buf);
 
-       /* Calculate the CRC */
-       off = offsetof(env_t, data);
-       new = crc32(new, (unsigned char *)(buf + off), ENV_SIZE);
-
-       if (crc == new)
-               env_import(buf, 1);
-       else
-               set_default_env("!bad CRC");
+       env_import(buf, 1);
 }
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
@@ -61,12 +68,12 @@ int saveenv(void)
        char    *res;
 
        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;
        }
-       env_new.crc = crc32(0, env_new.data, ENV_SIZE);
+       env_new.crc   = crc32(0, env_new.data, ENV_SIZE);
 
        return write_dataflash(CONFIG_ENV_ADDR,
                                (unsigned long)&env_new,
@@ -81,9 +88,39 @@ int saveenv(void)
  */
 int env_init(void)
 {
-       /* use default */
-       gd->env_addr = (ulong)&default_environment[0];
-       gd->env_valid = 1;
+       ulong crc, len, new;
+       unsigned off;
+       uchar buf[64];
+
+       if (gd->env_valid)
+               return 0;
+
+       AT91F_DataflashInit();  /* prepare for DATAFLASH read/write */
+
+       /* read old CRC */
+       read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, crc),
+               sizeof(ulong), (char *)&crc);
+
+       new = 0;
+       len = ENV_SIZE;
+       off = offsetof(env_t,data);
+       while (len > 0) {
+               int n = (len > sizeof(buf)) ? sizeof(buf) : len;
+
+               read_dataflash(CONFIG_ENV_ADDR + off, n, (char *)buf);
+
+               new = crc32 (new, buf, n);
+               len -= n;
+               off += n;
+       }
+
+       if (crc == new) {
+               gd->env_addr  = offsetof(env_t,data);
+               gd->env_valid = 1;
+       } else {
+               gd->env_addr  = (ulong)&default_environment[0];
+               gd->env_valid = 0;
+       }
 
        return 0;
 }