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

diff --git a/common/env_dataflash.c b/common/env_dataflash.c
index 2254b9b..fed919e 100644
--- a/common/env_dataflash.c
+++ b/common/env_dataflash.c
@@ -41,22 +41,22 @@ extern uchar default_environment[];
 uchar env_get_char_spec (int index)
 {
 	uchar c;
-	read_dataflash(CFG_ENV_ADDR + index + offsetof(env_t,data),
+	read_dataflash(CONFIG_ENV_ADDR + index + offsetof(env_t,data),
 	1, (char *)&c);
 	return (c);
 }
 
 void env_relocate_spec (void)
 {
-	read_dataflash(CFG_ENV_ADDR, CFG_ENV_SIZE, (char *)env_ptr);
+	read_dataflash(CONFIG_ENV_ADDR, CONFIG_ENV_SIZE, (char *)env_ptr);
 }
 
 int saveenv(void)
 {
 	/* env must be copied to do not alter env structure in memory*/
-	unsigned char temp[CFG_ENV_SIZE];
-	memcpy(temp, env_ptr, CFG_ENV_SIZE);
-	return write_dataflash(CFG_ENV_ADDR, (unsigned long)temp, CFG_ENV_SIZE);
+	unsigned char temp[CONFIG_ENV_SIZE];
+	memcpy(temp, env_ptr, CONFIG_ENV_SIZE);
+	return write_dataflash(CONFIG_ENV_ADDR, (unsigned long)temp, CONFIG_ENV_SIZE);
 }
 
 /************************************************************************
@@ -74,14 +74,14 @@ int env_init(void)
 		AT91F_DataflashInit();	/* prepare for DATAFLASH read/write */
 
 		/* read old CRC */
-		read_dataflash(CFG_ENV_ADDR + offsetof(env_t, crc),
+		read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, crc),
 			sizeof(ulong), (char *)&crc);
 		new = 0;
 		len = ENV_SIZE;
 		off = offsetof(env_t,data);
 		while (len > 0) {
 			int n = (len > sizeof(buf)) ? sizeof(buf) : len;
-			read_dataflash(CFG_ENV_ADDR + off, n, (char *)buf);
+			read_dataflash(CONFIG_ENV_ADDR + off, n, (char *)buf);
 			new = crc32 (new, buf, n);
 			len -= n;
 			off += n;