X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=common%2Fenv_nvram.c;h=a8b79591dcdc6e385ed6346eadee2a3bb6011ae1;hb=0e8d158664a913392cb01fb11a948d83f72e105e;hp=c59bf9faa1bdde58112737c117305d4c101de544;hpb=1ede78710c3bf9ad6f4a53aaddc3bcc86fedd9df;p=platform%2Fkernel%2Fu-boot.git

diff --git a/common/env_nvram.c b/common/env_nvram.c
index c59bf9f..a8b7959 100644
--- a/common/env_nvram.c
+++ b/common/env_nvram.c
@@ -52,7 +52,7 @@ 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";
@@ -66,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
@@ -83,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
@@ -95,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
 }
 
@@ -108,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
@@ -134,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);