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

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

diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h
index 75d1985..1daa574 100644 (file)
--- a/include/configs/Total5200.h
+++ b/include/configs/Total5200.h
@@ -268,6 +268,7 @@
  * Ethernet configuration
  */
 #define CONFIG_MPC5xxx_FEC     1
+#define CONFIG_MPC5xxx_FEC_SEVENWIRE
 /* dummy, 7-wire FEC does not have phy address */
 #define CONFIG_PHY_ADDR                0x00
 
@@ -396,6 +397,7 @@
 #define        CONFIG_IDE_RESET                /* reset for ide supported      */
 #define CONFIG_IDE_PREINIT
 
+#define CONFIG_SYS_ATA_CS_ON_I2C2
 #define CONFIG_SYS_IDE_MAXBUS          1       /* max. 1 IDE bus               */
 #define CONFIG_SYS_IDE_MAXDEVICE       1       /* max. 1 drive per IDE bus     */