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

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

diff --git a/include/configs/mx1fs2.h b/include/configs/mx1fs2.h
index d527d09..39950dc 100644 (file)
--- a/include/configs/mx1fs2.h
+++ b/include/configs/mx1fs2.h
@@ -98,7 +98,7 @@
 /*
  * Malloc pool need to host env + 128 Kb reserve for other allocations.
  */
-#define CFG_MALLOC_LEN   (CFG_ENV_SIZE + (128<<10) )
+#define CFG_MALLOC_LEN   (CONFIG_ENV_SIZE + (128<<10) )
 
 
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
@@ -207,9 +207,9 @@
 
 #define CFG_MONITOR_BASE       0x10000000
 #define CFG_MONITOR_LEN                0x20000         /* 128b ( 1 flash sector )   */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_ADDR           0x10020000      /* absolute address for now  */
-#define CFG_ENV_SIZE           0x20000
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_ADDR                0x10020000      /* absolute address for now  */
+#define CONFIG_ENV_SIZE                0x20000
 
 #define         CONFIG_ENV_OVERWRITE   1               /* env is not writable now   */