rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/Yukon8220.h b/include/configs/Yukon8220.h
index 00c4ff093a6ce78f995e673d3a15291598894d19..cbc1ed688a74a07fae91e16782be13069e831df6 100644 (file)
--- a/include/configs/Yukon8220.h
+++ b/include/configs/Yukon8220.h
@@ -31,6 +31,8 @@
 #define CONFIG_MPC8220         1
 #define CONFIG_YUKON8220       1       /* ... on Yukon board   */
 
+#define CONFIG_HIGH_BATS       1       /* High BATs supported */
+
 /* Input clock running at 30Mhz, read Hid1 for the CPU multiplier to
    determine the CPU speed. */
 #define CFG_MPC8220_CLKIN      30000000/* ... running at 30MHz */
@@ -131,9 +133,9 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS     3
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 70
 /*
-#define CFG_ENV_IS_IN_EEPROM   1
-#define CFG_ENV_OFFSET         0
-#define CFG_ENV_SIZE           256
+#define CONFIG_ENV_IS_IN_EEPROM        1
+#define CONFIG_ENV_OFFSET              0
+#define CONFIG_ENV_SIZE                256
 */
 
 /* If CFG_AMD_BOOT is defined, the the system will boot from AMD.
@@ -203,34 +205,34 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
+#define CONFIG_ENV_IS_IN_FLASH 1
 #if defined (CFG_AMD_BOOT)
-#define CFG_ENV_ADDR           (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE)
-#define CFG_ENV_SIZE           PHYS_AMD_SECT_SIZE
-#define CFG_ENV_SECT_SIZE      PHYS_AMD_SECT_SIZE
-#define CFG_ENV1_ADDR          (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE)
-#define CFG_ENV1_SIZE          PHYS_INTEL_SECT_SIZE
-#define CFG_ENV1_SECT_SIZE     PHYS_INTEL_SECT_SIZE
+#define CONFIG_ENV_ADDR                (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_AMD_SECT_SIZE)
+#define CONFIG_ENV_SIZE                PHYS_AMD_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE   PHYS_AMD_SECT_SIZE
+#define CONFIG_ENV1_ADDR               (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_INTEL_SECT_SIZE)
+#define CONFIG_ENV1_SIZE               PHYS_INTEL_SECT_SIZE
+#define CONFIG_ENV1_SECT_SIZE  PHYS_INTEL_SECT_SIZE
 #else
-#define CFG_ENV_ADDR           (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE)
-#define CFG_ENV_SIZE           PHYS_INTEL_SECT_SIZE
-#define CFG_ENV_SECT_SIZE      PHYS_INTEL_SECT_SIZE
-#define CFG_ENV1_ADDR          (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE)
-#define CFG_ENV1_SIZE          PHYS_AMD_SECT_SIZE
-#define CFG_ENV1_SECT_SIZE     PHYS_AMD_SECT_SIZE
+#define CONFIG_ENV_ADDR                (CFG_FLASH0_BASE + CFG_CS0_MASK - PHYS_INTEL_SECT_SIZE)
+#define CONFIG_ENV_SIZE                PHYS_INTEL_SECT_SIZE
+#define CONFIG_ENV_SECT_SIZE   PHYS_INTEL_SECT_SIZE
+#define CONFIG_ENV1_ADDR               (CFG_FLASH1_BASE + CFG_CS1_MASK - PHYS_AMD_SECT_SIZE)
+#define CONFIG_ENV1_SIZE               PHYS_AMD_SECT_SIZE
+#define CONFIG_ENV1_SECT_SIZE  PHYS_AMD_SECT_SIZE
 #endif
 
 #define CONFIG_ENV_OVERWRITE   1
 
-#if defined CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
-#undef CFG_ENV_IS_IN_EEPROM
-#elif defined CFG_ENV_IS_IN_EEPROM
-#undef CFG_ENV_IS_IN_NVRAM
-#undef CFG_ENV_IS_IN_FLASH
+#if defined CONFIG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_EEPROM
+#elif defined CONFIG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_FLASH
+#undef CONFIG_ENV_IS_IN_EEPROM
+#elif defined CONFIG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_NVRAM
+#undef CONFIG_ENV_IS_IN_FLASH
 #endif
 
 #ifndef CFG_JFFS2_FIRST_SECTOR