rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h
index ad9c15e..9513279 100644 (file)
--- a/include/configs/M54455EVB.h
+++ b/include/configs/M54455EVB.h
@@ -331,13 +331,13 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #ifdef CONFIG_CF_SBF
-#      define CFG_ENV_IS_IN_SPI_FLASH
-#      define CFG_ENV_SPI_CS           1
+#      define CONFIG_ENV_IS_IN_SPI_FLASH
+#      define CONFIG_ENV_SPI_CS                1
 #else
-#      define CFG_ENV_IS_IN_FLASH      1
+#      define CONFIG_ENV_IS_IN_FLASH   1
 #endif
 #undef CONFIG_ENV_OVERWRITE
-#undef CFG_ENV_IS_EMBEDDED
+#undef CONFIG_ENV_IS_EMBEDDED
 
 /*-----------------------------------------------------------------------
  * FLASH organization
@@ -347,24 +347,24 @@
 #      define CFG_FLASH0_BASE          CFG_SER_FLASH_BASE
 #      define CFG_FLASH1_BASE          CFG_CS0_BASE
 #      define CFG_FLASH2_BASE          CFG_CS1_BASE
-#      define CFG_ENV_OFFSET           0x30000
-#      define CFG_ENV_SIZE             0x2000
-#      define CFG_ENV_SECT_SIZE        0x10000
+#      define CONFIG_ENV_OFFSET                0x30000
+#      define CONFIG_ENV_SIZE          0x2000
+#      define CONFIG_ENV_SECT_SIZE     0x10000
 #endif
 #ifdef CFG_ATMEL_BOOT
 #      define CFG_FLASH_BASE           CFG_CS0_BASE
 #      define CFG_FLASH0_BASE          CFG_CS0_BASE
 #      define CFG_FLASH1_BASE          CFG_CS1_BASE
-#      define CFG_ENV_ADDR             (CFG_FLASH_BASE + 0x4000)
-#      define CFG_ENV_SECT_SIZE        0x2000
+#      define CONFIG_ENV_ADDR          (CFG_FLASH_BASE + 0x4000)
+#      define CONFIG_ENV_SECT_SIZE     0x2000
 #endif
 #ifdef CFG_INTEL_BOOT
 #      define CFG_FLASH_BASE           CFG_CS0_BASE
 #      define CFG_FLASH0_BASE          CFG_CS0_BASE
 #      define CFG_FLASH1_BASE          CFG_CS1_BASE
-#      define CFG_ENV_ADDR             (CFG_FLASH_BASE + 0x40000)
-#      define CFG_ENV_SIZE             0x2000
-#      define CFG_ENV_SECT_SIZE        0x20000
+#      define CONFIG_ENV_ADDR          (CFG_FLASH_BASE + 0x40000)
+#      define CONFIG_ENV_SIZE          0x2000
+#      define CONFIG_ENV_SECT_SIZE     0x20000
 #endif
 
 #define CFG_FLASH_CFI