Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging

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

diff --git a/common/env_nvram.c b/common/env_nvram.c
index a8b79591dcdc6e385ed6346eadee2a3bb6011ae1..b108e6e7610948e71da65eeb01d931674009340b 100644 (file)
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2000-2002
+ * (C) Copyright 2000-2010
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
  * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
@@ -35,7 +35,7 @@
  * space using its address and data registers. To enable usage of
  * NVRAM in those cases I invented the functions 'nvram_read()' and
  * 'nvram_write()', which will be activated upon the configuration
- * #define CFG_NVRAM_ACCESS_ROUTINE. Note, that those functions are
+ * #define CONFIG_SYS_NVRAM_ACCESS_ROUTINE. Note, that those functions are
  * strongly dependent on the used HW, and must be redefined for each
  * board that wants to use them.
  */
@@ -44,10 +44,12 @@
 #include <command.h>
 #include <environment.h>
 #include <linux/stddef.h>
+#include <search.h>
+#include <errno.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CFG_NVRAM_ACCESS_ROUTINE
+#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
 extern void *nvram_read(void *dest, const long src, size_t count);
 extern void nvram_write(long dest, const void *src, size_t count);
 env_t *env_ptr = NULL;
@@ -58,29 +60,10 @@ env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 char * env_name_spec = "NVRAM";
 
 extern uchar default_environment[];
-extern int default_environment_size;
 
-#ifdef CONFIG_AMIGAONEG3SE
-uchar env_get_char_spec (int index)
+uchar env_get_char_spec(int index)
 {
-#ifdef CFG_NVRAM_ACCESS_ROUTINE
-       uchar c;
-
-       nvram_read(&c, CONFIG_ENV_ADDR+index, 1);
-
-       return c;
-#else
-       uchar retval;
-       enable_nvram();
-       retval = *((uchar *)(gd->env_addr + index));
-       disable_nvram();
-       return retval;
-#endif
-}
-#else
-uchar env_get_char_spec (int index)
-{
-#ifdef CFG_NVRAM_ACCESS_ROUTINE
+#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
        uchar c;
 
        nvram_read(&c, CONFIG_ENV_ADDR+index, 1);
@@ -90,52 +73,57 @@ uchar env_get_char_spec (int index)
        return *((uchar *)(gd->env_addr + index));
 #endif
 }
-#endif
 
-void env_relocate_spec (void)
+void env_relocate_spec(void)
 {
-#if defined(CFG_NVRAM_ACCESS_ROUTINE)
-       nvram_read(env_ptr, CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
+       char buf[CONFIG_ENV_SIZE];
+
+#if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
+       nvram_read(buf, CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
 #else
-       memcpy (env_ptr, (void*)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
+       memcpy(buf, (void*)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
 #endif
+       env_import(buf, 1);
 }
 
-int saveenv (void)
+int saveenv(void)
 {
-       int rcode = 0;
-#ifdef CONFIG_AMIGAONEG3SE
-       enable_nvram();
-#endif
-#ifdef CFG_NVRAM_ACCESS_ROUTINE
-       nvram_write(CONFIG_ENV_ADDR, env_ptr, CONFIG_ENV_SIZE);
+       env_t   env_new;
+       ssize_t len;
+       char    *res;
+       int     rcode = 0;
+
+       res = (char *)&env_new.data;
+       len = hexport_r(&env_htab, '\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);
+
+#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
+       nvram_write(CONFIG_ENV_ADDR, &env_new, CONFIG_ENV_SIZE);
 #else
-       if (memcpy ((char *)CONFIG_ENV_ADDR, env_ptr, CONFIG_ENV_SIZE) == NULL)
-                   rcode = 1 ;
-#endif
-#ifdef CONFIG_AMIGAONEG3SE
-       udelay(10000);
-       disable_nvram();
+       if (memcpy((char *)CONFIG_ENV_ADDR, &env_new, CONFIG_ENV_SIZE) == NULL)
+               rcode = 1;
 #endif
        return rcode;
 }
 
 
-/************************************************************************
+/*
  * Initialize Environment use
  *
  * We are still running from ROM, so data use is limited
  */
-int env_init (void)
+int env_init(void)
 {
-#ifdef CONFIG_AMIGAONEG3SE
-       enable_nvram();
-#endif
-#if defined(CFG_NVRAM_ACCESS_ROUTINE)
+#if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
        ulong crc;
        uchar data[ENV_SIZE];
-       nvram_read (&crc, CONFIG_ENV_ADDR, sizeof(ulong));
-       nvram_read (data, CONFIG_ENV_ADDR+sizeof(ulong), ENV_SIZE);
+
+       nvram_read(&crc, CONFIG_ENV_ADDR, sizeof(ulong));
+       nvram_read(data, CONFIG_ENV_ADDR+sizeof(ulong), ENV_SIZE);
 
        if (crc32(0, data, ENV_SIZE) == crc) {
                gd->env_addr  = (ulong)CONFIG_ENV_ADDR + sizeof(long);
@@ -148,8 +136,5 @@ int env_init (void)
                gd->env_addr  = (ulong)&default_environment[0];
                gd->env_valid = 0;
        }
-#ifdef CONFIG_AMIGAONEG3SE
-       disable_nvram();
-#endif
        return (0);
 }