X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=board%2Fcpu87%2Fflash.c;h=f7e121f09cf57168871fb95cc4b7ee846bbb9614;hb=0e8d158664a913392cb01fb11a948d83f72e105e;hp=b96a30c5a3007c0a8adbce88dcd15757876579ce;hpb=1ede78710c3bf9ad6f4a53aaddc3bcc86fedd9df;p=people%2Fms%2Fu-boot.git

diff --git a/board/cpu87/flash.c b/board/cpu87/flash.c
index b96a30c5a3..f7e121f09c 100644
--- a/board/cpu87/flash.c
+++ b/board/cpu87/flash.c
@@ -236,20 +236,20 @@ unsigned long flash_init (void)
 #endif
 #endif
 
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
-# ifndef  CFG_ENV_SIZE
-#  define CFG_ENV_SIZE	CFG_ENV_SECT_SIZE
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
+# ifndef  CONFIG_ENV_SIZE
+#  define CONFIG_ENV_SIZE	CONFIG_ENV_SECT_SIZE
 # endif
-# if CFG_ENV_ADDR >= CFG_BOOTROM_BASE
+# if CONFIG_ENV_ADDR >= CFG_BOOTROM_BASE
 	if (size_b1) {
 		flash_protect (FLAG_PROTECT_SET,
-				CFG_ENV_ADDR,
-				CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]);
+				CONFIG_ENV_ADDR,
+				CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);
 	}
 # else
 	flash_protect (FLAG_PROTECT_SET,
-		       CFG_ENV_ADDR,
-		       CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]);
+		       CONFIG_ENV_ADDR,
+		       CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
 # endif
 #endif