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

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

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index 237f361..bf2a8dd 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -51,7 +51,7 @@
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN         (CFG_ENV_SIZE + 128 * 1024)
+#define CFG_MALLOC_LEN         (CONFIG_ENV_SIZE + 128 * 1024)
 #define CFG_GBL_DATA_SIZE      128  /* size in bytes reserved for initial data */
 
 /*
@@ -152,9 +152,9 @@
 #define CFG_MAX_FLASH_SECT     259          /* max number of sectors on one chip */
 #define CFG_MONITOR_BASE       CFG_FLASH_BASE /* Monitor at beginning of flash */
 
-#define        CFG_ENV_IS_IN_EEPROM            1
-#define CFG_ENV_OFFSET                 0x00    /* environment starts here     */
-#define CFG_ENV_SIZE                   4096
+#define        CONFIG_ENV_IS_IN_EEPROM         1
+#define CONFIG_ENV_OFFSET                      0x00    /* environment starts here     */
+#define CONFIG_ENV_SIZE                        4096
 #define CFG_I2C_EEPROM_ADDR            0x52
 #define CFG_EEPROM_PAGE_WRITE_BITS     5       /* 5 bits = 32 octets          */
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* between stop and start      */