X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Fexbitgen%2Fflash.c;h=745fba2af8a8f513891076904f3fe7d9051af8d1;hb=0e8d158664a913392cb01fb11a948d83f72e105e;hp=dddd06effadda60fdd5afb3b01aefa31d50a4e35;hpb=a524e112b424c6843800ea2f19d3a8cf01d0aa94;p=u-boot

diff --git a/board/exbitgen/flash.c b/board/exbitgen/flash.c
index dddd06effa..745fba2af8 100644
--- a/board/exbitgen/flash.c
+++ b/board/exbitgen/flash.c
@@ -28,11 +28,10 @@
  * Chris Hallinan - DS4.COM, Inc. - clh@net1plus.com
  */
 
-#include <asm/types.h>
+#include <common.h>
 #include <asm/u-boot.h>
 #include <asm/processor.h>
 #include <ppc4xx.h>
-#include <common.h>
 
 flash_info_t	flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips	*/
 
@@ -127,10 +126,10 @@ unsigned long flash_init (void)
 #endif
 #endif
 
-#if (CFG_ENV_IS_IN_FLASH == 1) && 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