Merge git://git.denx.de/u-boot-sunxi

[u-boot] / env / nvram.c

diff --git a/env/nvram.c b/env/nvram.c
index d046c9393cff7bbdbd24de996884f36e8538e9f5..c8b34754efc692690ad3510eb9f790d708b2a72e 100644 (file)
--- a/env/nvram.c
+++ b/env/nvram.c
@@ -36,15 +36,12 @@ DECLARE_GLOBAL_DATA_PTR;
 #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;
 #else
 env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif
 
-char *env_name_spec = "NVRAM";
-
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
-uchar env_get_char_spec(int index)
+static int env_nvram_get_char(int index)
 {
        uchar c;
 
@@ -54,7 +51,7 @@ uchar env_get_char_spec(int index)
 }
 #endif
 
-void env_relocate_spec(void)
+static int env_nvram_load(void)
 {
        char buf[CONFIG_ENV_SIZE];
 
@@ -64,9 +61,11 @@ void env_relocate_spec(void)
        memcpy(buf, (void *)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
 #endif
        env_import(buf, 1);
+
+       return 0;
 }
 
-int saveenv(void)
+static int env_nvram_save(void)
 {
        env_t   env_new;
        int     rcode = 0;
@@ -89,7 +88,7 @@ int saveenv(void)
  *
  * We are still running from ROM, so data use is limited
  */
-int env_init(void)
+static int env_nvram_init(void)
 {
 #if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
        ulong crc;
@@ -107,8 +106,19 @@ int env_init(void)
                gd->env_valid = ENV_VALID;
        } else {
                gd->env_addr    = (ulong)&default_environment[0];
-               gd->env_valid   = 0;
+               gd->env_valid   = ENV_INVALID;
        }
 
        return 0;
 }
+
+U_BOOT_ENV_LOCATION(nvram) = {
+       .location       = ENVL_NVRAM,
+       ENV_NAME("NVRAM")
+#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
+       .get_char       = env_nvram_get_char,
+#endif
+       .load           = env_nvram_load,
+       .save           = env_save_ptr(env_nvram_save),
+       .init           = env_nvram_init,
+};