Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index 3d28913..7f24c4e 100644 (file)
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -192,22 +192,22 @@
 /* Configuration for environment
  * Environment is embedded in u-boot in the second sector of the flash
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_OVERWRITE   1
-#undef CFG_ENV_IS_EMBEDDED
+#undef CONFIG_ENV_IS_EMBEDDED
 
 /*-----------------------------------------------------------------------
  * FLASH organization
  */
 #define CFG_FLASH_BASE         CFG_CS0_BASE
 #define CFG_FLASH0_BASE                CFG_CS0_BASE
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x8000)
-#define CFG_ENV_SECT_SIZE      0x8000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x8000)
+#define CONFIG_ENV_SECT_SIZE   0x8000
 
 #define CFG_FLASH_CFI
 #ifdef CFG_FLASH_CFI
 
-#      define CFG_FLASH_CFI_DRIVER     1
+#      define CONFIG_FLASH_CFI_DRIVER  1
 #      define CFG_FLASH_SIZE           0x1000000       /* Max size that the board might have */
 #      define CFG_FLASH_CFI_WIDTH      FLASH_CFI_16BIT
 #      define CFG_MAX_FLASH_BANKS      1       /* max number of memory banks */