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

[karo-tx-uboot.git] / include / configs / CU824.h

diff --git a/include/configs/CU824.h b/include/configs/CU824.h
index f36d8dacc0cf7a94166b8986cb1cbdbaf587d2f9..a40df76f3e820677a36cf7a1190af96443e527ea 100644 (file)
--- a/include/configs/CU824.h
+++ b/include/configs/CU824.h
@@ -271,15 +271,15 @@
        /* Warining: environment is not EMBEDDED in the U-Boot code.
         * It's stored in flash separately.
         */
-#define CFG_ENV_IS_IN_FLASH        1
+#define CONFIG_ENV_IS_IN_FLASH     1
 #if 0
-#define CFG_ENV_ADDR           0xFF008000
-#define CFG_ENV_SIZE           0x8000  /* Size of the Environment Sector       */
+#define CONFIG_ENV_ADDR                0xFF008000
+#define CONFIG_ENV_SIZE                0x8000  /* Size of the Environment Sector       */
 #else
-#define CFG_ENV_ADDR           0xFFFC0000
-#define CFG_ENV_SIZE           0x4000  /* Size of the Environment              */
-#define CFG_ENV_OFFSET         0       /* starting right at the beginning      */
-#define CFG_ENV_SECT_SIZE      0x40000 /* Size of the Environment Sector       */
+#define CONFIG_ENV_ADDR                0xFFFC0000
+#define CONFIG_ENV_SIZE                0x4000  /* Size of the Environment              */
+#define CONFIG_ENV_OFFSET              0       /* starting right at the beginning      */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* Size of the Environment Sector       */
 #endif
 
 /*-----------------------------------------------------------------------