diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2012-10-22 16:40:40 +0000 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2013-01-28 06:57:50 +0100 |
| commit | 09439c3197bb19e091ce160b398451517a8fe1b0 (patch) | |
| tree | ef51af7c54feb1eaddd86316aa3747b634059fc3 | |
| parent | c30eab2ddd5d2238e06ea2acde91620019ea7f85 (diff) | |
| download | u-boot-imx-09439c3197bb19e091ce160b398451517a8fe1b0.zip u-boot-imx-09439c3197bb19e091ce160b398451517a8fe1b0.tar.gz u-boot-imx-09439c3197bb19e091ce160b398451517a8fe1b0.tar.bz2 | |
net: fec_mxc: delete CONFIG_FEC_MXC_MULTI
It is more logical to test for CONFIG_FEC_MXC_PHYADDR
to determine whether to define the function fecmxc_initialize.
Signed-off-by: Troy Kisky <troy.kisky@boundarydevices.com>
| -rw-r--r-- | drivers/net/fec_mxc.c | 2 | ||||
| -rw-r--r-- | include/configs/m28evk.h | 1 | ||||
| -rw-r--r-- | include/configs/mx28evk.h | 1 | ||||
| -rw-r--r-- | include/configs/sc_sps_1.h | 1 |
4 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 3e232c7..6596ceb 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1021,7 +1021,7 @@ err1: return ret; } -#ifndef CONFIG_FEC_MXC_MULTI +#ifdef CONFIG_FEC_MXC_PHYADDR int fecmxc_initialize(bd_t *bd) { int lout = 1; diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index d34e970..1b51fe2 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -191,7 +191,6 @@ #ifdef CONFIG_CMD_NET #define CONFIG_ETHPRIME "FEC0" #define CONFIG_FEC_MXC -#define CONFIG_FEC_MXC_MULTI #define CONFIG_MII #define CONFIG_FEC_XCV_TYPE RMII #endif diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index dd0ef21..71447d9 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -163,7 +163,6 @@ #define CONFIG_NET_MULTI #define CONFIG_ETHPRIME "FEC0" #define CONFIG_FEC_MXC -#define CONFIG_FEC_MXC_MULTI #define CONFIG_MII #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_MX28_FEC_MAC_IN_OCOTP diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index cb99d58..21c76b52 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -158,7 +158,6 @@ #ifdef CONFIG_CMD_NET #define CONFIG_ETHPRIME "FEC0" #define CONFIG_FEC_MXC -#define CONFIG_FEC_MXC_MULTI #define CONFIG_MII #define CONFIG_DISCOVER_PHY #define CONFIG_FEC_XCV_TYPE RMII |