rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h
index 38a022611ae92a31c9b680f3519945bc8e9bcef6..a705ac1a8cf799d7de03567181e1402f556c2999 100644 (file)
--- a/include/configs/IceCube.h
+++ b/include/configs/IceCube.h
@@ -37,6 +37,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
  */
@@ -172,9 +174,9 @@
  * IPB Bus clocking configuration.
  */
 #if defined(CONFIG_LITE5200B)
-#define CFG_IPBCLK_EQUALS_XLBCLK       /* define for 133MHz speed */
+#define CFG_IPBCLK_EQUALS_XLBCLK       /* define for 133MHz speed */
 #else
-#undef CFG_IPBCLK_EQUALS_XLBCLK        /* define for 133MHz speed */
+#undef CFG_IPBCLK_EQUALS_XLBCLK                /* define for 133MHz speed */
 #endif
 #endif /* CONFIG_MPC5200 */
 
@@ -211,26 +213,26 @@
 #define CFG_FLASH_BASE         0xFE000000
 #define CFG_FLASH_SIZE         0x01000000
 #if !defined(CFG_LOWBOOT)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x01760000 + 0x00800000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x01760000 + 0x00800000)
 #else  /* CFG_LOWBOOT */
 #if defined(CFG_LOWBOOT08)
 # error CFG_LOWBOOT08 is incompatible with the Lite5200B
 #endif
 #if defined(CFG_LOWBOOT16)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x01060000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x01060000)
 #endif
 #endif /* CFG_LOWBOOT */
 #else /* !CONFIG_LITE5200B (IceCube)*/
 #define CFG_FLASH_BASE         0xFF000000
 #define CFG_FLASH_SIZE         0x01000000
 #if !defined(CFG_LOWBOOT)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00740000 + 0x00800000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00740000 + 0x00800000)
 #else  /* CFG_LOWBOOT */
 #if defined(CFG_LOWBOOT08)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00040000 + 0x00800000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00040000 + 0x00800000)
 #endif
 #if defined(CFG_LOWBOOT16)
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + 0x00040000)
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + 0x00040000)
 #endif
 #endif /* CFG_LOWBOOT */
 #endif /* CONFIG_LITE5200B */
@@ -244,7 +246,7 @@
 #undef CONFIG_FLASH_16BIT      /* Flash is 8-bit */
 
 #if defined(CONFIG_LITE5200B)
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #define CFG_FLASH_CFI
 #define CFG_FLASH_BANKS_LIST   {CFG_CS1_START,CFG_CS0_START}
 #endif
@@ -253,12 +255,12 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_SIZE           0x10000
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_SIZE                0x10000
 #if defined(CONFIG_LITE5200B)
-#define CFG_ENV_SECT_SIZE      0x20000
+#define CONFIG_ENV_SECT_SIZE   0x20000
 #else
-#define CFG_ENV_SECT_SIZE      0x10000
+#define CONFIG_ENV_SECT_SIZE   0x10000
 #endif
 #define CONFIG_ENV_OVERWRITE   1