X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=board%2Fbarco%2Fflash.c;h=53fc58ca154bd6f3a1e025a5aec93b071a9fadb9;hb=0e8d158664a913392cb01fb11a948d83f72e105e;hp=9502560d6769cdd638a0aaf89f44b71735f9daea;hpb=7d9b5bae5ba558c7464d89d033aca04acaf01172;p=platform%2Fkernel%2Fu-boot.git

diff --git a/board/barco/flash.c b/board/barco/flash.c
index 9502560..53fc58c 100644
--- a/board/barco/flash.c
+++ b/board/barco/flash.c
@@ -58,15 +58,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
 
@@ -224,10 +224,10 @@ unsigned long flash_init(void)
 				&flash_info[0]);
 #endif
 
-#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
 		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