Merge git://www.denx.de/git/u-boot-marvell

[people/ms/u-boot.git] / include / configs / cm-bf527.h

diff --git a/include/configs/cm-bf527.h b/include/configs/cm-bf527.h
index b15a1eb7a2ee82333382d23a6bf3425811a10651..0b31dc95d796762bb5ff500600c757dc51f26949 100644 (file)
--- a/include/configs/cm-bf527.h
+++ b/include/configs/cm-bf527.h
@@ -1,5 +1,5 @@
 /*
- * U-boot - Configuration file for CM-BF527 board
+ * U-Boot - Configuration file for CM-BF527 board
  */
 
 #ifndef __CONFIG_CM_BF527_H__
@@ -7,14 +7,12 @@
 
 #include <asm/config-pre.h>
 
-
 /*
  * Processor Settings
  */
 #define CONFIG_BFIN_CPU             bf527-0.0
 #define CONFIG_BFIN_BOOT_MODE       BFIN_BOOT_PARA
 
-
 /*
  * Clock Settings
  *     CCLK = (CLKIN * VCO_MULT) / CCLK_DIV
@@ -41,7 +39,6 @@
 /* Decrease core voltage */
 #define CONFIG_VR_CTL_VAL (VLEV_120 | CLKBUFOE | FREQ_1000)
 
-
 /*
  * Memory Settings
  */
@@ -58,7 +55,6 @@
 #define CONFIG_SYS_MONITOR_LEN (256 * 1024)
 #define CONFIG_SYS_MALLOC_LEN  (128 * 1024)
 
-
 /*
  * NAND Settings
  * (can't be used sametime as ethernet)
@@ -71,7 +67,6 @@
 #define CONFIG_CMD_NAND
 #endif
 
-
 /*
  * Network Settings
  */
@@ -83,9 +78,6 @@
 #define CONFIG_NETCONSOLE      1
 #endif
 #define CONFIG_HOSTNAME                cm-bf527
-/* Uncomment next line to use fixed MAC address */
-/* #define CONFIG_ETHADDR      02:80:ad:20:31:e8 */
-
 
 /*
  * Flash Settings
@@ -98,7 +90,6 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS     1
 #define CONFIG_SYS_MAX_FLASH_SECT      67
 
-
 /*
  * Env Storage Settings
  */
@@ -109,13 +100,11 @@
 #define CONFIG_ENV_SECT_SIZE   0x8000
 #define CONFIG_ENV_IS_EMBEDDED_IN_LDR
 
-
 /*
  * I2C Settings
  */
-#define CONFIG_BFIN_TWI_I2C    1
-#define CONFIG_HARD_I2C                1
-
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_ADI
 
 /*
  * Misc Settings
@@ -129,7 +118,6 @@
        "flashboot=flread 20040000 1000000 300000;" \
        "bootm 0x1000000\0"
 
-
 /*
  * Pull in common ADI header for remaining command/environment setup
  */