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

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

diff --git a/include/configs/wepep250.h b/include/configs/wepep250.h
index c67b301..2072f6e 100644 (file)
--- a/include/configs/wepep250.h
+++ b/include/configs/wepep250.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 */
 
 #define CONFIG_STACKSIZE        (120<<10)      /* stack size */
@@ -132,9 +132,9 @@
 /*
  * Configuration for FLASH memory
  */
-#define CFG_MAX_FLASH_BANKS            1       /* FLASH banks count (not chip count)*/
-#define CFG_MAX_FLASH_SECT             128     /* number of sector in FLASH bank    */
-#define WEP_FLASH_BUS_WIDTH    4       /* we use 32 bit FLASH memory...     */
+#define CFG_MAX_FLASH_BANKS    1       /* FLASH banks count (not chip count)*/
+#define CFG_MAX_FLASH_SECT     128     /* number of sector in FLASH bank    */
+#define WEP_FLASH_BUS_WIDTH    4       /* we use 32 bit FLASH memory...     */
 #define WEP_FLASH_INTERLEAVE   2       /* ... made of 2 chips */
 #define WEP_FLASH_BANK_SIZE  0x2000000  /* size of one flash bank*/
 #define WEP_FLASH_SECT_SIZE  0x0040000  /* size of erase sector */
@@ -178,9 +178,9 @@
 
 #define CFG_MONITOR_BASE       PHYS_FLASH_1
 #define CFG_MONITOR_LEN                0x20000         /* 128kb ( 1 flash sector )  */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_ADDR           0x20000         /* absolute address for now  */
-#define CFG_ENV_SIZE           0x2000
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_ADDR                0x20000         /* absolute address for now  */
+#define CONFIG_ENV_SIZE                0x2000
 
 #undef  CONFIG_ENV_OVERWRITE                    /* env is not writable now   */