diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:17:42 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-06-11 22:17:42 +0200 |
| commit | 32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7 (patch) | |
| tree | 35b56ce4860d33a3b75358251c6e4e4e7bdb38f9 /drivers/net/mcffec.c | |
| parent | 1730edf76c54381475e2da11f75b1ce563c4e62c (diff) | |
| parent | 3b904ccb93c3196727e2e9870cb1df903cab19ad (diff) | |
| download | u-boot-imx-32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7.zip u-boot-imx-32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7.tar.gz u-boot-imx-32d4e38eeb5bcc2f854787bfa68bea2b55eaa1d7.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-net
Diffstat (limited to 'drivers/net/mcffec.c')
| -rw-r--r-- | drivers/net/mcffec.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c index 5ab4726..58ed5e3 100644 --- a/drivers/net/mcffec.c +++ b/drivers/net/mcffec.c @@ -27,8 +27,6 @@ #include <common.h> #include <malloc.h> -#ifdef CONFIG_MCFFEC - #include <asm/fec.h> #include <asm/immap.h> @@ -51,8 +49,6 @@ DECLARE_GLOBAL_DATA_PTR; -#if defined(CONFIG_CMD_NET) && defined(CONFIG_NET_MULTI) - struct fec_info_s fec_info[] = { #ifdef CFG_FEC0_IOBASE { @@ -125,11 +121,17 @@ void setFecDuplexSpeed(volatile fec_t * fecp, bd_t * bd, int dup_spd) } if ((dup_spd & 0xFFFF) == _100BASET) { +#ifdef CONFIG_MCF5445x + fecp->rcr &= ~0x200; /* disabled 10T base */ +#endif #ifdef MII_DEBUG printf("100Mbps\n"); #endif bd->bi_ethspeed = 100; } else { +#ifdef CONFIG_MCF5445x + fecp->rcr |= 0x200; /* enabled 10T base */ +#endif #ifdef MII_DEBUG printf("10Mbps\n"); #endif @@ -599,6 +601,3 @@ int mcffec_initialize(bd_t * bis) return 1; } - -#endif /* CONFIG_CMD_NET, FEC_ENET & NET_MULTI */ -#endif /* CONFIG_MCFFEC */ |