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

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

diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index 71fa36b..3818368 100644 (file)
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.h
@@ -50,6 +50,8 @@
 #define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH  */
 #define BOOTFLAG_WARM          0x02    /* Software reboot           */
 
+#define CONFIG_HIGH_BATS       1       /* High BATs supported */
+
 /*
  * Serial console configuration
  */
@@ -231,7 +233,7 @@
 #define CFG_FLASH_BASE         0xff000000
 #define CFG_FLASH_SIZE         0x01000000
 #define CFG_MAX_FLASH_BANKS    1       /* max num of memory banks      */
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0)
 
 #define CFG_MAX_FLASH_SECT     256     /* max num of sects on one chip */
 
@@ -269,9 +271,9 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_EEPROM   1       /* turn on EEPROM env feature */
-#define CFG_ENV_OFFSET         0x1000
-#define CFG_ENV_SIZE           0x0700
+#define CONFIG_ENV_IS_IN_EEPROM        1       /* turn on EEPROM env feature */
+#define CONFIG_ENV_OFFSET              0x1000
+#define CONFIG_ENV_SIZE                0x0700
 
 /*
  * VPD settings