Patchwork [U-Boot,V3,2/9] net: fec_mxc: delete CONFIG_FEC_MXC_MULTI

login
register
mail settings
Submitter Troy Kisky
Date Oct. 23, 2012, 2:40 a.m.
Message ID <1350960047-23404-3-git-send-email-troy.kisky@boundarydevices.com>
Download mbox | patch
Permalink /patch/193312/
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Comments

Troy Kisky - Oct. 23, 2012, 2:40 a.m.
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>
---
 drivers/net/fec_mxc.c      |    2 +-
 include/configs/m28evk.h   |    1 -
 include/configs/mx28evk.h  |    1 -
 include/configs/sc_sps_1.h |    1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

Patch

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 bdbb820..2e8a236 100644
--- a/include/configs/m28evk.h
+++ b/include/configs/m28evk.h
@@ -189,7 +189,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 7cdbec6..8178aa8 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 f5dc393..4177e3d 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