Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

[platform/kernel/u-boot.git] / include / configs / incaip.h

diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 2e4ee66..5368ac8 100644 (file)
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -150,11 +150,11 @@
 #define CFG_FLASH_ERASE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Write */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
-#define CFG_ENV_ADDR           0xB0030000
-#define CFG_ENV_SIZE           0x10000
+#define CONFIG_ENV_ADDR                0xB0030000
+#define CONFIG_ENV_SIZE                0x10000
 
 #define CONFIG_FLASH_16BIT