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>

diff --git a/board/fads/fads.h b/board/fads/fads.h
index 83c6704..ffa72cb 100644 (file)
--- 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 fa753dd..bcbd7aa 100644 (file)
--- 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 7919991..8a76c26 100644 (file)
--- 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 ea49a5d..5ba7585 100644 (file)
--- 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 89e0eeb..c2ab18a 100644 (file)
--- 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 3eb3131..c8b5a6d 100644 (file)
--- 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 3b4bff3..3ee2b39 100644 (file)
--- 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 47e1e03..e1cc720 100644 (file)
--- 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 599f8dc..283c873 100644 (file)
--- 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 7bb9f60..826778c 100644 (file)
--- 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 1a15c77..42692d6 100644 (file)
--- 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 da4156c..3b9da17 100644 (file)
--- 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 a3c71e3..3a022af 100644 (file)
--- 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 a4e6c5d..6bb4619 100644 (file)
--- 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 9121023..cba51c8 100644 (file)
--- 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 bb3d19d..e3c6fd3 100644 (file)
--- 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 945f47f..20404a3 100644 (file)
--- 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 fb8085d..cf66e04 100644 (file)
--- 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 50f1c63..7310abf 100644 (file)
--- 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 66f7a11..8237ba1 100644 (file)
--- 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 a254bcd..f075442 100644 (file)
--- 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 104d94e..c7e3899 100644 (file)
--- 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 a15f69a..2ed51f7 100644 (file)
--- 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 6f2425f..f46c464 100644 (file)
--- 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 f12765d..a3ab798 100644 (file)
--- 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 c1c2e03..3c2de40 100644 (file)
--- 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 */