X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=board%2Fr360mpi%2Fflash.c;h=8145437b1a07518ce960aa846863b76d2cced982;hb=0e8d158664a913392cb01fb11a948d83f72e105e;hp=fef483c3f8267f12d4a4b74d3b6d8acc7aaa31e4;hpb=d791b1dc3e64a6a6317293245d884589bc5c6277;p=platform%2Fkernel%2Fu-boot.git

diff --git a/board/r360mpi/flash.c b/board/r360mpi/flash.c
index fef483c..8145437 100644
--- a/board/r360mpi/flash.c
+++ b/board/r360mpi/flash.c
@@ -31,15 +31,15 @@
 
 flash_info_t flash_info[CFG_MAX_FLASH_BANKS];	/* info for FLASH chips    */
 
-#if defined(CFG_ENV_IS_IN_FLASH)
-# ifndef  CFG_ENV_ADDR
-#  define CFG_ENV_ADDR	(CFG_FLASH_BASE + CFG_ENV_OFFSET)
+#if defined(CONFIG_ENV_IS_IN_FLASH)
+# ifndef  CONFIG_ENV_ADDR
+#  define CONFIG_ENV_ADDR	(CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
 # endif
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE	CONFIG_ENV_SECT_SIZE
 # endif
-# ifndef  CFG_ENV_SECT_SIZE
-#  define CFG_ENV_SECT_SIZE  CFG_ENV_SIZE
+# ifndef  CONFIG_ENV_SECT_SIZE
+#  define CONFIG_ENV_SECT_SIZE  CONFIG_ENV_SIZE
 # endif
 #endif
 
@@ -107,15 +107,15 @@ unsigned long flash_init (void)
 	/* monitor protection ON by default */
 	(void) flash_protect (FLAG_PROTECT_SET,
 				CFG_FLASH_BASE,
-				CFG_FLASH_BASE + CFG_MONITOR_LEN - 1,
+				CFG_FLASH_BASE + monitor_flash_len - 1,
 				&flash_info[0]);
 #endif
 
-#ifdef	CFG_ENV_IS_IN_FLASH
+#ifdef	CONFIG_ENV_IS_IN_FLASH
 	/* ENV protection ON by default */
 	flash_protect (FLAG_PROTECT_SET,
-			CFG_ENV_ADDR,
-			CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+			CONFIG_ENV_ADDR,
+			CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
 			&flash_info[0]);
 #endif