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>
This commit is contained in:
TsiChung Liew 2008-03-30 01:22:13 -05:00 committed by Wolfgang Denk
parent f33fca22e7
commit 0f3ba7e978
26 changed files with 29 additions and 4 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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