diff options
author | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:14:28 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-09-12 16:14:28 +0200 |
commit | 225f0eaa745adfae05931848543d99942798756a (patch) | |
tree | f5c2b1a7ddb5f2c64063b5ef3ccae0f5ded41fb8 /common/env_nvram.c | |
parent | 6b8be3e58e9cc1badb7a709b0f3568d4d8eca4b7 (diff) | |
parent | afbc526336447a7357e9c82852df0377d09a8089 (diff) | |
download | u-boot-imx-225f0eaa745adfae05931848543d99942798756a.zip u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.gz u-boot-imx-225f0eaa745adfae05931848543d99942798756a.tar.bz2 |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'common/env_nvram.c')
-rw-r--r-- | common/env_nvram.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/common/env_nvram.c b/common/env_nvram.c index fa77719..a8b7959 100644 --- a/common/env_nvram.c +++ b/common/env_nvram.c @@ -41,21 +41,18 @@ */ #include <common.h> - -DECLARE_GLOBAL_DATA_PTR; - -#ifdef CFG_ENV_IS_IN_NVRAM /* Environment is in NVRAM */ - #include <command.h> #include <environment.h> #include <linux/stddef.h> +DECLARE_GLOBAL_DATA_PTR; + #ifdef CFG_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; #else -env_t *env_ptr = (env_t *)CFG_ENV_ADDR; +env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR; #endif char * env_name_spec = "NVRAM"; @@ -69,7 +66,7 @@ uchar env_get_char_spec (int index) #ifdef CFG_NVRAM_ACCESS_ROUTINE uchar c; - nvram_read(&c, CFG_ENV_ADDR+index, 1); + nvram_read(&c, CONFIG_ENV_ADDR+index, 1); return c; #else @@ -86,7 +83,7 @@ uchar env_get_char_spec (int index) #ifdef CFG_NVRAM_ACCESS_ROUTINE uchar c; - nvram_read(&c, CFG_ENV_ADDR+index, 1); + nvram_read(&c, CONFIG_ENV_ADDR+index, 1); return c; #else @@ -98,9 +95,9 @@ uchar env_get_char_spec (int index) void env_relocate_spec (void) { #if defined(CFG_NVRAM_ACCESS_ROUTINE) - nvram_read(env_ptr, CFG_ENV_ADDR, CFG_ENV_SIZE); + nvram_read(env_ptr, CONFIG_ENV_ADDR, CONFIG_ENV_SIZE); #else - memcpy (env_ptr, (void*)CFG_ENV_ADDR, CFG_ENV_SIZE); + memcpy (env_ptr, (void*)CONFIG_ENV_ADDR, CONFIG_ENV_SIZE); #endif } @@ -111,9 +108,9 @@ int saveenv (void) enable_nvram(); #endif #ifdef CFG_NVRAM_ACCESS_ROUTINE - nvram_write(CFG_ENV_ADDR, env_ptr, CFG_ENV_SIZE); + nvram_write(CONFIG_ENV_ADDR, env_ptr, CONFIG_ENV_SIZE); #else - if (memcpy ((char *)CFG_ENV_ADDR, env_ptr, CFG_ENV_SIZE) == NULL) + if (memcpy ((char *)CONFIG_ENV_ADDR, env_ptr, CONFIG_ENV_SIZE) == NULL) rcode = 1 ; #endif #ifdef CONFIG_AMIGAONEG3SE @@ -137,11 +134,11 @@ int env_init (void) #if defined(CFG_NVRAM_ACCESS_ROUTINE) ulong crc; uchar data[ENV_SIZE]; - nvram_read (&crc, CFG_ENV_ADDR, sizeof(ulong)); - nvram_read (data, CFG_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)CFG_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); @@ -156,5 +153,3 @@ int env_init (void) #endif return (0); } - -#endif /* CFG_ENV_IS_IN_NVRAM */ |