X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=board%2Ficecube%2Fflash.c;h=0aa78eb27f9baf063748643220dc86a20a55f788;hb=0e8d158664a913392cb01fb11a948d83f72e105e;hp=713011c972aa22fb299a7aa3b3813198a55261f7;hpb=84bd92bdda05e6aaae3150ed6ef957b3a67398b7;p=platform%2Fkernel%2Fu-boot.git

diff --git a/board/icecube/flash.c b/board/icecube/flash.c
index 713011c..0aa78eb 100644
--- a/board/icecube/flash.c
+++ b/board/icecube/flash.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 
+#ifndef CONFIG_FLASH_CFI_DRIVER
 flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/
 
 /* NOTE - CONFIG_FLASH_16BIT means the CPU interface is 16-bit, it
@@ -87,12 +88,12 @@ unsigned long flash_init (void)
 		      flash_get_info(CFG_MONITOR_BASE));
 #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,
-		      flash_get_info(CFG_ENV_ADDR));
+		      CONFIG_ENV_ADDR,
+		      CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
+		      flash_get_info(CONFIG_ENV_ADDR));
 #endif
 
 
@@ -489,3 +490,4 @@ static int write_word_amd (flash_info_t *info, FPWV *dest, FPW data)
 
 	return (res);
 }
+#endif /*CONFIG_FLASH_CFI_DRIVER*/