diff --git a/board/fads/fads.h b/board/fads/fads.h index 83c67049cea18d1eee98894b458cb5c1897dfa00..ffa72cbb41980fb11896a70d17d56f5bb059e303 100644 --- a/board/fads/fads.h +++ b/board/fads/fads.h @@ -96,6 +96,7 @@ #ifdef CONFIG_FEC_ENET #define CFG_DISCOVER_PHY +#define CONFIG_MII_INIT 1 #endif diff --git a/common/cmd_mii.c b/common/cmd_mii.c index fa753dd67d3f511e915e9fabfcbe6228bc212664..bcbd7aa4ee33556f5bae516fa835833ab95b0d2e 100644 --- a/common/cmd_mii.c +++ b/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 diff --git a/include/configs/Adder.h b/include/configs/Adder.h index 79199912df983ac3408d0cb56592477f47f0c58a..8a76c264cad3f254b8ccc3f0fe831de98a744dee 100644 --- a/include/configs/Adder.h +++ b/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 */ diff --git a/include/configs/EB+MCF-EV123.h b/include/configs/EB+MCF-EV123.h index ea49a5d939525cc027598120c16e98101eba9664..5ba7585bceeb983957c4eef76b6aa58e4300386a 100644 --- a/include/configs/EB+MCF-EV123.h +++ b/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 diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h index 89e0eebeead22e21e88465d1492e545695791b8b..c2ab18a79edbeedcf4f39eaf876cca8242e0d514 100644 --- a/include/configs/EP88x.h +++ b/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 */ diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h index 3eb3131d4d8637d8e2483a4765046aec5b0b95eb..c8b5a6d8a56e37158d3d24d3ac27a7fe2cc22700 100644 --- a/include/configs/GEN860T.h +++ b/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 /* diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index 3b4bff306a277d06619048bab3a924b5393cf183..3ee2b395a41561bde6a9d61aaa3fdcb2b01c9028 100644 --- a/include/configs/M5235EVB.h +++ b/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 diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h index 47e1e038b1eab68d821329925ae5d8b2854145f2..e1cc720e779522efbaf172c63c1c484b913fb893 100644 --- a/include/configs/M5271EVB.h +++ b/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 diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index 599f8dcb4d0fb3610c64068c542516acab88a2dc..283c873d8349fade56c556bb8ff552481eb96d19 100644 --- a/include/configs/M5275EVB.h +++ b/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 diff --git a/include/configs/M5282EVB.h b/include/configs/M5282EVB.h index 7bb9f60f7650058ff24dc1967da773a036cfc903..826778c35a4264b8393f3fc57be43eb3310ae8ea 100644 --- a/include/configs/M5282EVB.h +++ b/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 diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 1a15c77bdaab57af49d85d764494d1312c75031d..42692d69fa3bc723cfe2734d4c1350fd2f5d0d2f 100644 --- a/include/configs/M5329EVB.h +++ b/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 diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index da4156c747e6bc1321035b7a1facb6df6ed8fff9..3b9da17e40b169b643abd32b02e011d9143d1bfc 100644 --- a/include/configs/M5373EVB.h +++ b/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 diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index a3c71e37dc583fa74d63b178c2357aba4827ed8d..3a022afafd2014d79e74c6b0bf147784e35b4ada 100644 --- a/include/configs/M54455EVB.h +++ b/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 diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index a4e6c5d12573a573a98b926fa2010920480ccbca..6bb461913a72629203c030c703d2e35e17866401 100644 --- a/include/configs/M5475EVB.h +++ b/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 diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 9121023f8984b4ee2799d330752996ef19850f92..cba51c87c1db062f4df65d974c596544e3ff2834 100644 --- a/include/configs/M5485EVB.h +++ b/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 diff --git a/include/configs/NETPHONE.h b/include/configs/NETPHONE.h index bb3d19d14cadd15fb31fae92269c29c138d0903f..e3c6fd333b5ac4640daa39effb82ea22f1396e7c 100644 --- a/include/configs/NETPHONE.h +++ b/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 diff --git a/include/configs/NETTA.h b/include/configs/NETTA.h index 945f47f8f95694eddc27f64bb29324f8f177560d..20404a394f21f5147e1eccc5d281173e957ce09e 100644 --- a/include/configs/NETTA.h +++ b/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) diff --git a/include/configs/NETTA2.h b/include/configs/NETTA2.h index fb8085d56c7d6d7dcada520d59260b65322204e8..cf66e04702cee5d6a5c3986dbafd879040e0b18e 100644 --- a/include/configs/NETTA2.h +++ b/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 diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h index 50f1c6362057430eaa593968a8e9633854bfd7a3..7310abfa60048e0d499068a18557b48525243004 100644 --- a/include/configs/TK885D.h +++ b/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" diff --git a/include/configs/TOP860.h b/include/configs/TOP860.h index 66f7a1150d00aa092c1adced601b8a6221155a7a..8237ba1af3a30636667b2c87a8fdb1ccf1801cfc 100644 --- a/include/configs/TOP860.h +++ b/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 /*----------------------------------------------------------------------- diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index a254bcd8416941d5231245c275992eb7c084f04f..f075442f38113e3ba9c93d2bc1af94599d434c27 100644 --- a/include/configs/TQM885D.h +++ b/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 diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 104d94ec141878383256b731e6a9f65b6b5786ed..c7e3899e6392c7b8501d81bcd8dfc05ee9f038b2 100644 --- a/include/configs/cobra5272.h +++ b/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 diff --git a/include/configs/idmr.h b/include/configs/idmr.h index a15f69aa16b962469efa987085d54594dbedb2f5..2ed51f778488362eefa66999823edf9cc27c68a9 100644 --- a/include/configs/idmr.h +++ b/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 diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h index 6f2425fc7f8bc488067913dc872e138e24bef66a..f46c464cbc04e358cd2924f8b4d8b3b2a41fe8a3 100644 --- a/include/configs/spc1920.h +++ b/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 diff --git a/include/configs/stxxtc.h b/include/configs/stxxtc.h index f12765d660a2bbf314f0ef4f2cbc674f2172e63a..a3ab7989777b012db1a5f3f7b5f8388a4d45d7ad 100644 --- a/include/configs/stxxtc.h +++ b/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 diff --git a/include/configs/uc100.h b/include/configs/uc100.h index c1c2e03293ef911241780b6d0c24c56b57d72c07..3c2de40dfc3cb1b96558bce26ca94c028e5ec1ef 100644 --- a/include/configs/uc100.h +++ b/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 */