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

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

diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h
index d554348..5257db3 100644 (file)
--- a/include/configs/cm5200.h
+++ b/include/configs/cm5200.h
@@ -31,6 +31,8 @@
 #define CONFIG_MPC5200         1       /* (more precisely an MPC5200 CPU) */
 #define CONFIG_CM5200          1       /* ... on CM5200 platform */
 
+#define CONFIG_HIGH_BATS       1       /* High BATs supported */
+
 /*
  * Supported commands
  */
@@ -175,7 +177,7 @@
  * Flash configuration
  */
 #define CFG_FLASH_CFI          1
-#define CFG_FLASH_CFI_DRIVER   1
+#define CONFIG_FLASH_CFI_DRIVER        1
 #define CFG_FLASH_BASE         0xfc000000
 /* we need these despite using CFI */
 #define CFG_MAX_FLASH_BANKS    1       /* max num of flash banks */
@@ -262,13 +264,13 @@
 /*
  * Environment settings
  */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_SIZE           0x10000
-#define CFG_ENV_SECT_SIZE      0x20000
-#define CFG_ENV_ADDR           (CFG_FLASH_BASE + CFG_MONITOR_LEN)
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_SIZE                0x10000
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR                (CFG_FLASH_BASE + CFG_MONITOR_LEN)
 /* Configuration of redundant environment */
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR + CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
 /*
  * Pin multiplexing configuration