mmc: don't allow extra cmdline arguments

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

diff --git a/common/env_nvram.c b/common/env_nvram.c
index b108e6e7610948e71da65eeb01d931674009340b..ff74a6c2c65e6c7127e4042f97da9263f482a502 100644 (file)
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -52,65 +52,66 @@ 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";
+char *env_name_spec = "NVRAM";
 
-extern uchar default_environment[];
+#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
+static char env_buf[CONFIG_ENV_SIZE];
+#endif
 
+#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
 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
-       return *((uchar *)(gd->env_addr + index));
-#endif
 }
+#endif
 
 void env_relocate_spec(void)
 {
-       char buf[CONFIG_ENV_SIZE];
+       char *buf;
 
 #if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
+       buf = env_buf;
        nvram_read(buf, CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
 #else
-       memcpy(buf, (void*)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE);
+       buf = (void *)CONFIG_ENV_ADDR;
 #endif
        env_import(buf, 1);
 }
 
 int saveenv(void)
 {
-       env_t   env_new;
+#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
+       env_t   *env_new = (env_t *)env_buf;
+#else
+       env_t   *env_new = (env_t *)CONFIG_ENV_ADDR;
+#endif
        ssize_t len;
        char    *res;
        int     rcode = 0;
 
-       res = (char *)&env_new.data;
-       len = hexport_r(&env_htab, '\0', &res, ENV_SIZE, 0, NULL);
+       res = (char *)env_new->data;
+       len = hexport_r(&env_htab, '\0', 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);
+       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_new, CONFIG_ENV_SIZE) == NULL)
-               rcode = 1;
+       nvram_write(CONFIG_ENV_ADDR, env_new, CONFIG_ENV_SIZE);
 #endif
        return rcode;
 }
 
-
 /*
  * Initialize Environment use
  *
@@ -120,21 +121,22 @@ int env_init(void)
 {
 #if defined(CONFIG_SYS_NVRAM_ACCESS_ROUTINE)
        ulong crc;
-       uchar data[ENV_SIZE];
+       uchar *data = env_buf;
 
        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;
 }