rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h
index 588c00c..03d21be 100644 (file)
--- a/include/configs/M54451EVB.h
+++ b/include/configs/M54451EVB.h
@@ -140,9 +140,8 @@
        "u-boot=u-boot.bin\0"                   \
        "load=tftp ${loadaddr) ${u-boot}\0"     \
        "upd=run load; run prog\0"              \
-       "prog=prot off 0 " MK_STR(CFG_UBOOT_END)\
-       "; era 0 " MK_STR(CFG_UBOOT_END)        \
-       "2ffff;"                                \
+       "prog=prot off 0 " MK_STR(CFG_UBOOT_END)        \
+       "; era 0 " MK_STR(CFG_UBOOT_END) " ;"   \
        "cp.b ${loadaddr} 0 ${filesize};"       \
        "save\0"                                \
        ""
@@ -267,18 +266,18 @@
  * Environment is embedded in u-boot in the second sector of the flash
  */
 #if defined(CONFIG_CF_SBF)
-#      define CFG_ENV_IS_IN_SPI_FLASH  1
-#      define CFG_ENV_SPI_CS           1
-#      define CFG_ENV_OFFSET           0x20000
-#      define CFG_ENV_SIZE             0x2000
-#      define CFG_ENV_SECT_SIZE        0x10000
+#      define CONFIG_ENV_IS_IN_SPI_FLASH       1
+#      define CONFIG_ENV_SPI_CS                1
+#      define CONFIG_ENV_OFFSET                0x20000
+#      define CONFIG_ENV_SIZE          0x2000
+#      define CONFIG_ENV_SECT_SIZE     0x10000
 #else
-#      define CFG_ENV_IS_IN_FLASH      1
-#      define CFG_ENV_ADDR             (CFG_FLASH_BASE + 0x4000)
-#      define CFG_ENV_SECT_SIZE        0x2000
+#      define CONFIG_ENV_IS_IN_FLASH   1
+#      define CONFIG_ENV_ADDR          (CFG_FLASH_BASE + 0x4000)
+#      define CONFIG_ENV_SECT_SIZE     0x2000
 #endif
 #undef CONFIG_ENV_OVERWRITE
-#undef CFG_ENV_IS_EMBEDDED
+#undef CONFIG_ENV_IS_EMBEDDED
 
 /*-----------------------------------------------------------------------
  * FLASH organization