cmd_bdinfo: simplify local static funcs a bit

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

diff --git a/common/env_nvram.c b/common/env_nvram.c
index 6e90f2bcb53d82c30422beff96933794444ea001..726eaac55efd3ceb1ee341d6f1efbbe9dcd41540 100644 (file)
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -52,21 +52,19 @@ 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 = NULL;
+env_t *env_ptr;
 #else
 env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
 #endif
 
-char * env_name_spec = "NVRAM";
-
-extern uchar default_environment[];
+char *env_name_spec = "NVRAM";
 
 uchar env_get_char_spec(int index)
 {
 #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
        uchar c;
 
-       nvram_read(&c, CONFIG_ENV_ADDR+index, 1);
+       nvram_read(&c, CONFIG_ENV_ADDR + index, 1);
 
        return c;
 #else
@@ -81,7 +79,7 @@ void env_relocate_spec(void)
 #if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
        nvram_read(buf, CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
 #else
-       memcpy(buf, (void*)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
+       memcpy(buf, (void *)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
 #endif
        env_import(buf, 1);
 }
@@ -94,7 +92,7 @@ int saveenv(void)
        int     rcode = 0;
 
        res = (char *)&env_new.data;
-       len = hexport('\0', &res, ENV_SIZE);
+       len = hexport_r(&env_htab, '\0', &res, ENV_SIZE, 0, NULL);
        if (len < 0) {
                error("Cannot export environment: errno = %d\n", errno);
                return 1;
@@ -110,7 +108,6 @@ int saveenv(void)
        return rcode;
 }
 
-
 /*
  * Initialize Environment use
  *
@@ -123,18 +120,19 @@ int env_init(void)
        uchar data[ENV_SIZE];
 
        nvram_read(&crc, CONFIG_ENV_ADDR, sizeof(ulong));
-       nvram_read(data, CONFIG_ENV_ADDR+sizeof(ulong), ENV_SIZE);
+       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);
+               gd->env_addr    = (ulong)CONFIG_ENV_ADDR + sizeof(long);
 #else
        if (crc32(0, env_ptr->data, ENV_SIZE) == env_ptr->crc) {
-               gd->env_addr  = (ulong)&(env_ptr->data);
+               gd->env_addr    = (ulong)&env_ptr->data;
 #endif
-               gd->env_valid = 1;
+               gd->env_valid   = 1;
        } else {
-               gd->env_addr  = (ulong)&default_environment[0];
-               gd->env_valid = 0;
+               gd->env_addr    = (ulong)&default_environment[0];
+               gd->env_valid   = 0;
        }
-       return (0);
+
+       return 0;
 }