arm: fixloop(): do not use r8 for relocation

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

diff --git a/common/env_dataflash.c b/common/env_dataflash.c
index fed919e675ec6b3eb3c4d8ea6aa7d031e3f8db0c..270f2b3272766e8a3117155071b20dfe5de77813 100644 (file)
--- a/common/env_dataflash.c
+++ b/common/env_dataflash.c
@@ -1,4 +1,5 @@
-/* LowLevel function for DataFlash environment support
+/*
+ * LowLevel function for DataFlash environment support
  * Author : Gilles Gastaldi (Atmel)
  *
  * This program is free software; you can redistribute it and/or
@@ -15,13 +16,14 @@
  * 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>
 #include <environment.h>
 #include <linux/stddef.h>
 #include <dataflash.h>
+#include <search.h>
+#include <errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -29,40 +31,59 @@ env_t *env_ptr = NULL;
 
 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[];
-/* extern int default_environment_size; */
+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 env_get_char_spec(int index)
 {
        uchar c;
+
        read_dataflash(CONFIG_ENV_ADDR + index + offsetof(env_t,data),
-       1, (char *)&c);
+                       1, (char *)&c);
        return (c);
 }
 
-void env_relocate_spec (void)
+void env_relocate_spec(void)
 {
-       read_dataflash(CONFIG_ENV_ADDR, CONFIG_ENV_SIZE, (char *)env_ptr);
+       char buf[CONFIG_ENV_SIZE];
+
+       read_dataflash(CONFIG_ENV_ADDR, CONFIG_ENV_SIZE, buf);
+
+       env_import(buf, 1);
 }
 
+#ifdef CONFIG_ENV_OFFSET_REDUND
+#error No support for redundant environment on dataflash yet!
+#endif
+
 int saveenv(void)
 {
-       /* env must be copied to do not alter env structure in memory*/
-       unsigned char temp[CONFIG_ENV_SIZE];
-       memcpy(temp, env_ptr, CONFIG_ENV_SIZE);
-       return write_dataflash(CONFIG_ENV_ADDR, (unsigned long)temp, CONFIG_ENV_SIZE);
+       env_t   env_new;
+       ssize_t len;
+       char    *res;
+
+       res = (char *)&env_new.data;
+       len = hexport('\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);
+
+       return write_dataflash(CONFIG_ENV_ADDR,
+                               (unsigned long)&env_new,
+                               CONFIG_ENV_SIZE);
 }
 
-/************************************************************************
- * Initialize Environment use
+/*
+ * Initialize environment use
  *
- * We are still running from ROM, so data use is limited
+ * We are still running from ROM, so data use is limited.
  * Use a (moderately small) buffer on the stack
  */
 int env_init(void)
@@ -70,30 +91,36 @@ int env_init(void)
        ulong crc, len, new;
        unsigned off;
        uchar buf[64];
-       if (gd->env_valid == 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;
-               }
+
+       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);
+       return 0;
 }