diff options
| author | Wolfgang Denk <wd@denx.de> | 2007-05-28 01:11:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2007-05-28 01:11:11 +0200 |
| commit | 19bf91f9628f80a55d4f171df71041574882b3d6 (patch) | |
| tree | 14fd9ebacffd43564eaf014997baacea39abde2c /cpu/mpc5xxx/fec.c | |
| parent | 7d075ee1d8cfcab9dd5b356816f17d013498cc62 (diff) | |
| parent | 7049288fb1f16f1b317140226cdebd07bd416395 (diff) | |
| download | u-boot-imx-19bf91f9628f80a55d4f171df71041574882b3d6.zip u-boot-imx-19bf91f9628f80a55d4f171df71041574882b3d6.tar.gz u-boot-imx-19bf91f9628f80a55d4f171df71041574882b3d6.tar.bz2 | |
Merge with /home/tur/git/u-boot#motionpro
Diffstat (limited to 'cpu/mpc5xxx/fec.c')
| -rw-r--r-- | cpu/mpc5xxx/fec.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cpu/mpc5xxx/fec.c b/cpu/mpc5xxx/fec.c index 00e8911..8136366 100644 --- a/cpu/mpc5xxx/fec.c +++ b/cpu/mpc5xxx/fec.c @@ -395,9 +395,7 @@ static int mpc5xxx_fec_init(struct eth_device *dev, bd_t * bis) static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis) { mpc5xxx_fec_priv *fec = (mpc5xxx_fec_priv *)dev->priv; -#ifndef CONFIG_MOTIONPRO const uint8 phyAddr = CONFIG_PHY_ADDR; /* Only one PHY */ -#endif /* !CONFIG_MOTIONPRO */ #if (DEBUG & 0x1) printf ("mpc5xxx_fec_init_phy... Begin\n"); @@ -437,7 +435,6 @@ static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis) * PHY initialization for the Motion-PRO board, until a proper fix is found. */ -#ifndef CONFIG_MOTIONPRO if (fec->xcv_type != SEVENWIRE) { /* * Set MII_SPEED = (1/(mii_speed * 2)) * System Clock @@ -564,7 +561,6 @@ static int mpc5xxx_fec_init_phy(struct eth_device *dev, bd_t * bis) } } -#endif /* !CONFIG_MOTIONPRO */ #if (DEBUG & 0x2) if (fec->xcv_type != SEVENWIRE) |