X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=board%2Fprodrive%2Fpdnb3%2Fflash.c;h=5738c5bd04cf3e7235d726ddb32735e04c6f1a37;hb=0e8d158664a913392cb01fb11a948d83f72e105e;hp=d0e5fe703b98fd386fed671abc7d5d780dfb156c;hpb=894b773c8678ce68b01c99b02ffad236e470458b;p=platform%2Fkernel%2Fu-boot.git

diff --git a/board/prodrive/pdnb3/flash.c b/board/prodrive/pdnb3/flash.c
index d0e5fe7..5738c5b 100644
--- a/board/prodrive/pdnb3/flash.c
+++ b/board/prodrive/pdnb3/flash.c
@@ -24,6 +24,8 @@
 #include <common.h>
 #include <asm/arch/ixp425.h>
 
+#if !defined(CONFIG_FLASH_CFI_DRIVER)
+
 /*
  * include common flash code (for esd boards)
  */
@@ -69,17 +71,19 @@ unsigned long flash_init(void)
 
 	/* Environment protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
-		      CFG_ENV_ADDR,
-		      CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+		      CONFIG_ENV_ADDR,
+		      CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
 		      &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 
 	/* Redundant environment protection ON by default */
 	flash_protect(FLAG_PROTECT_SET,
-		      CFG_ENV_ADDR_REDUND,
-		      CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
+		      CONFIG_ENV_ADDR_REDUND,
+		      CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SIZE_REDUND - 1,
 		      &flash_info[CFG_MAX_FLASH_BANKS - 1]);
 
 	flash_info[0].size = size;
 
 	return size;
 }
+
+#endif /* CONFIG_FLASH_CFI_DRIVER */