Merge with rsync://git-user@source.denx.net/git/u-boot.git

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

diff --git a/include/configs/TQM8540.h b/include/configs/TQM8540.h
index d28d2f3..8438b93 100644 (file)
--- a/include/configs/TQM8540.h
+++ b/include/configs/TQM8540.h
@@ -279,18 +279,25 @@
 #endif
 
 #define CONFIG_MII             1       /* MII PHY management */
-#undef CONFIG_MPC85XX_TSEC1
+#define CONFIG_MPC85XX_TSEC1   1
+#define CONFIG_MPC85XX_TSEC1_NAME      "TSEC0"
 #define CONFIG_MPC85XX_TSEC2   1
+#define CONFIG_MPC85XX_TSEC2_NAME      "TSEC1"
 #define TSEC1_PHY_ADDR         0
 #define TSEC2_PHY_ADDR         1
 #define TSEC1_PHYIDX           0
 #define TSEC2_PHYIDX           0
 
 #define CONFIG_MPC85XX_FEC     1
-#define FEC_PHY_ADDR           0
+#define CONFIG_MPC85XX_FEC_NAME        "FEC"
+#define FEC_PHY_ADDR           2
 #define FEC_PHYIDX             0
 
-#define CONFIG_ETHPRIME                "ENET1"
+#define CONFIG_HAS_ETH1
+#define CONFIG_HAS_ETH2
+
+/* Options are TSEC[0-1], FEC */
+#define CONFIG_ETHPRIME                "TSEC1"
 
 #endif /* CONFIG_TSEC_ENET */