diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-28 12:45:00 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-28 12:45:00 (GMT) |
| commit | 4711e7f7af839b41a6d78490257a9e7975494dd3 (patch) | |
| tree | 7fb01e8da7cee537ebd1a070c750da7c4cc43482 /drivers/net | |
| parent | fe34b6a4845476208ca7d19a35179e56bebf3877 (diff) | |
| parent | 77cbd3a14184c61d55d7fcddd88fa4e96efc9901 (diff) | |
| download | u-boot-4711e7f7af839b41a6d78490257a9e7975494dd3.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/fec_mxc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 360f8e4..e871b3e 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -233,6 +233,7 @@ static int miiphy_restart_aneg(struct eth_device *dev) return ret; } +#ifndef CONFIG_FEC_FIXED_SPEED static int miiphy_wait_aneg(struct eth_device *dev) { uint32_t start; @@ -260,6 +261,7 @@ static int miiphy_wait_aneg(struct eth_device *dev) return 0; } +#endif /* CONFIG_FEC_FIXED_SPEED */ #endif static int fec_rx_task_enable(struct fec_priv *fec) @@ -502,6 +504,8 @@ static int fec_open(struct eth_device *edev) } speed = fec->phydev->speed; } +#elif CONFIG_FEC_FIXED_SPEED + speed = CONFIG_FEC_FIXED_SPEED; #else miiphy_wait_aneg(edev); speed = miiphy_speed(edev->name, fec->phy_id); |