Browse Source

Add CONFIG_MII_INIT support to related boards

Replace CONFIG_8xx and CONFIG_MCF532x to CONFIG_MII_INIT in
cmd_init.c. Add CONFIG_MII_INIT to board configuration files
that use mii_init() in cmd_init.c.

Signed-off-by: TsiChung Liew <Tsi-Chung.Liew@freescale.com>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
TsiChung Liew 17 years ago
parent
commit
0f3ba7e978

+ 1 - 0
board/fads/fads.h

@@ -96,6 +96,7 @@
 
 #ifdef CONFIG_FEC_ENET
 #define CFG_DISCOVER_PHY
+#define CONFIG_MII_INIT		1
 #endif
 
 

+ 1 - 1
common/cmd_mii.c

@@ -306,7 +306,7 @@ int do_mii (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
 		return 1;
 	}
 
-#if defined(CONFIG_8xx) || defined(CONFIG_MCF532x) || defined(CONFIG_MII_INIT)
+#if defined(CONFIG_MII_INIT)
 	mii_init ();
 #endif
 

+ 1 - 0
include/configs/Adder.h

@@ -42,6 +42,7 @@
 
 #if defined(CONFIG_ETHER_ON_FEC1) || defined(CONFIG_ETHER_ON_FEC2)
 #define CFG_DISCOVER_PHY
+#define CONFIG_MII_INIT		1
 #define FEC_ENET
 #endif /* CONFIG_ETHER_ON_FEC || CONFIG_ETHER_ON_FEC2 */
 

+ 1 - 0
include/configs/EB+MCF-EV123.h

@@ -88,6 +88,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_NET_MULTI		1
 #	define CONFIG_MII		1
+#	define CONFIG_MII_INIT		1
 #	define CFG_DISCOVER_PHY
 #	define CFG_RX_ETH_BUFFER	8
 #	define CFG_FAULT_ECHO_LINK_DOWN

+ 1 - 0
include/configs/EP88x.h

@@ -42,6 +42,7 @@
 #define	CONFIG_ETHER_ON_FEC2			/* Enable Ethernet on FEC2	*/
 #if defined(CONFIG_ETHER_ON_FEC1) || defined(CONFIG_ETHER_ON_FEC2)
 #define CFG_DISCOVER_PHY
+#define CONFIG_MII_INIT		1
 #define FEC_ENET
 #endif /* CONFIG_FEC_ENET */
 

+ 1 - 0
include/configs/GEN860T.h

@@ -147,6 +147,7 @@
 #define CONFIG_FEC_ENET
 #define CFG_DISCOVER_PHY
 #define CONFIG_MII
+#define CONFIG_MII_INIT			1
 #define CONFIG_PHY_ADDR         		0
 
 /*

+ 1 - 0
include/configs/M5235EVB.h

@@ -77,6 +77,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_NET_MULTI		1
 #	define CONFIG_MII		1
+#	define CONFIG_MII_INIT		1
 #	define CFG_DISCOVER_PHY
 #	define CFG_RX_ETH_BUFFER	8
 #	define CFG_FAULT_ECHO_LINK_DOWN

+ 1 - 0
include/configs/M5271EVB.h

@@ -88,6 +88,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_NET_MULTI		1
 #	define CONFIG_MII		1
+#	define CONFIG_MII_INIT		1
 #	define CFG_DISCOVER_PHY
 #	define CFG_RX_ETH_BUFFER	8
 #	define CFG_FAULT_ECHO_LINK_DOWN

+ 1 - 0
include/configs/M5275EVB.h

@@ -89,6 +89,7 @@
 #ifdef CONFIG_MCFFEC
 #define CONFIG_NET_MULTI	1
 #define CONFIG_MII		1
+#define CONFIG_MII_INIT		1
 #define CFG_DISCOVER_PHY
 #define CFG_RX_ETH_BUFFER	8
 #define CFG_FAULT_ECHO_LINK_DOWN

+ 1 - 0
include/configs/M5282EVB.h

@@ -75,6 +75,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_NET_MULTI		1
 #	define CONFIG_MII		1
+#	define CONFIG_MII_INIT		1
 #	define CFG_DISCOVER_PHY
 #	define CFG_RX_ETH_BUFFER	8
 #	define CFG_FAULT_ECHO_LINK_DOWN

+ 1 - 0
include/configs/M5329EVB.h

@@ -70,6 +70,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_NET_MULTI		1
 #	define CONFIG_MII		1
+#	define CONFIG_MII_INIT		1
 #	define CFG_DISCOVER_PHY
 #	define CFG_RX_ETH_BUFFER	8
 #	define CFG_FAULT_ECHO_LINK_DOWN

+ 1 - 0
include/configs/M5373EVB.h

@@ -70,6 +70,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_NET_MULTI		1
 #	define CONFIG_MII		1
+#	define CONFIG_MII_INIT		1
 #	define CFG_DISCOVER_PHY
 #	define CFG_RX_ETH_BUFFER	8
 #	define CFG_FAULT_ECHO_LINK_DOWN

+ 2 - 2
include/configs/M54455EVB.h

@@ -83,9 +83,9 @@
 /* Network configuration */
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
-#	define CONFIG_NET_MULTI	1
+#	define CONFIG_NET_MULTI		1
 #	define CONFIG_MII		1
-#	define CONFIG_CF_DOMII
+#	define CONFIG_MII_INIT		1
 #	define CFG_DISCOVER_PHY
 #	define CFG_RX_ETH_BUFFER	8
 #	define CFG_FAULT_ECHO_LINK_DOWN

+ 1 - 0
include/configs/M5475EVB.h

@@ -69,6 +69,7 @@
 #ifdef CONFIG_FSLDMAFEC
 #	define CONFIG_NET_MULTI		1
 #	define CONFIG_MII		1
+#	define CONFIG_MII_INIT		1
 #	define CONFIG_HAS_ETH1
 
 #	define CFG_DISCOVER_PHY

+ 1 - 0
include/configs/M5485EVB.h

@@ -69,6 +69,7 @@
 #ifdef CONFIG_FSLDMAFEC
 #	define CONFIG_NET_MULTI		1
 #	define CONFIG_MII		1
+#	define CONFIG_MII_INIT		1
 #	define CONFIG_HAS_ETH1
 
 #	define CFG_DISCOVER_PHY

+ 1 - 0
include/configs/NETPHONE.h

@@ -101,6 +101,7 @@
 #define	FEC_ENET		1	/* eth.c needs it that way... */
 #undef CFG_DISCOVER_PHY
 #define CONFIG_MII		1
+#define CONFIG_MII_INIT		1
 #define CONFIG_RMII		1	/* use RMII interface */
 
 #define CONFIG_ETHER_ON_FEC1	1

+ 1 - 0
include/configs/NETTA.h

@@ -97,6 +97,7 @@
 #define	FEC_ENET		1	/* eth.c needs it that way... */
 #undef  CFG_DISCOVER_PHY		/* do not discover phys */
 #define CONFIG_MII		1
+#define CONFIG_MII_INIT		1
 #define CONFIG_RMII		1	/* use RMII interface */
 
 #if defined(CONFIG_NETTA_ISDN)

+ 1 - 0
include/configs/NETTA2.h

@@ -102,6 +102,7 @@
 #define	FEC_ENET		1	/* eth.c needs it that way... */
 #undef CFG_DISCOVER_PHY
 #define CONFIG_MII		1
+#define CONFIG_MII_INIT		1
 #define CONFIG_RMII		1	/* use RMII interface */
 
 #define CONFIG_ETHER_ON_FEC1	1

+ 2 - 0
include/configs/TK885D.h

@@ -510,6 +510,8 @@
 #define CONFIG_FEC2_PHY	2
 #endif
 
+#define CONFIG_MII_INIT	1
+
 #define CONFIG_NET_RETRY_COUNT	3
 #define CONFIG_ETHPRIME		"FEC ETHERNET"
 

+ 1 - 0
include/configs/TOP860.h

@@ -205,6 +205,7 @@
 #define	FEC_ENET			1	/* eth.c needs it that way... */
 #define CFG_DISCOVER_PHY	1
 #define CONFIG_MII			1
+#define CONFIG_MII_INIT		1
 #define CONFIG_PHY_ADDR		31
 
 /*-----------------------------------------------------------------------

+ 1 - 0
include/configs/TQM885D.h

@@ -497,6 +497,7 @@
 
 #if defined(CONFIG_CMD_MII)
 #define CFG_DISCOVER_PHY
+#define CONFIG_MII_INIT	1
 #endif
 
 #define CONFIG_NET_RETRY_COUNT 1	/* reduce max. timeout before

+ 1 - 0
include/configs/cobra5272.h

@@ -158,6 +158,7 @@
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_NET_MULTI		1
 #	define CONFIG_MII		1
+#	define CONFIG_MII_INIT		1
 #	define CFG_DISCOVER_PHY
 #	define CFG_RX_ETH_BUFFER	8
 #	define CFG_FAULT_ECHO_LINK_DOWN

+ 2 - 1
include/configs/idmr.h

@@ -156,7 +156,8 @@
 #define CONFIG_MCFFEC
 #ifdef CONFIG_MCFFEC
 #	define CONFIG_NET_MULTI		1
-#define CONFIG_MII		1
+#	define CONFIG_MII		1
+#	define CONFIG_MII_INIT		1
 #	define CFG_DISCOVER_PHY
 #	define CFG_RX_ETH_BUFFER	8
 #	define CFG_FAULT_ECHO_LINK_DOWN

+ 1 - 0
include/configs/spc1920.h

@@ -31,6 +31,7 @@
 #undef	CONFIG_8xx_CONS_NONE
 
 #define CONFIG_MII
+#define CONFIG_MII_INIT		1
 #undef CONFIG_ETHER_ON_FEC1
 #define CONFIG_ETHER_ON_FEC2
 #define FEC_ENET

+ 1 - 0
include/configs/stxxtc.h

@@ -97,6 +97,7 @@
 #define	FEC_ENET		1	/* eth.c needs it that way... */
 #undef CFG_DISCOVER_PHY
 #define CONFIG_MII		1
+#define CONFIG_MII_INIT		1
 #undef CONFIG_RMII
 
 #define CONFIG_ETHER_ON_FEC1	1

+ 1 - 0
include/configs/uc100.h

@@ -510,6 +510,7 @@
 #define	CONFIG_FEC_ENET		1	/* use FEC ethernet  */
 #define FEC_ENET
 #define CONFIG_MII
+#define CONFIG_MII_INIT		1
 #define CFG_DISCOVER_PHY	1
 
 #endif	/* __CONFIG_H */