diff options
| author | Terry Lv <r65388@freescale.com> | 2009-12-29 15:26:47 +0800 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2012-09-05 14:57:16 -0400 |
| commit | 3fd8cf4c35e05e76047ab902333e9ea1e7ff2a2b (patch) | |
| tree | b24cee6ea9537baf7f2cce5a6bdbf16477abc0df | |
| parent | e2286f3979c1d89661e36eed8789d5b8b8228baa (diff) | |
ENGR00119715: Add multi network support for mx35
mx35 need to enable both smc911x and FEC.
So add CONFIG_ETHPRIME for it.
Also, change CONFIG_ETH_PRIME to CONFIG_ETHPRIME.
Signed-off-by: Terry Lv <r65388@freescale.com>
| -rw-r--r-- | include/configs/mx25_3stack.h | 2 | ||||
| -rw-r--r-- | include/configs/mx35_3stack.h | 1 | ||||
| -rw-r--r-- | include/configs/mx35_3stack_mmc.h | 1 | ||||
| -rw-r--r-- | net/eth.c | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/include/configs/mx25_3stack.h b/include/configs/mx25_3stack.h index 5084fd8bdd..e1a35f6c66 100644 --- a/include/configs/mx25_3stack.h +++ b/include/configs/mx25_3stack.h @@ -147,7 +147,7 @@ #define CONFIG_NET_RETRY_COUNT 100 #define CONFIG_CMD_DHCP #define CONFIG_NET_MULTI -#define CONFIG_ETH_PRIME +#define CONFIG_ETHPRIME #define CONFIG_MXC_FEC #define CONFIG_MII diff --git a/include/configs/mx35_3stack.h b/include/configs/mx35_3stack.h index b2fb714753..21e5acfdfd 100644 --- a/include/configs/mx35_3stack.h +++ b/include/configs/mx35_3stack.h @@ -122,6 +122,7 @@ #define CONFIG_HAS_ETH1 #define CONFIG_NET_MULTI 1 +#define CONFIG_ETHPRIME #define CONFIG_MXC_FEC #define CONFIG_MII #define CONFIG_DISCOVER_PHY diff --git a/include/configs/mx35_3stack_mmc.h b/include/configs/mx35_3stack_mmc.h index 948bc9161c..9a1dd70481 100644 --- a/include/configs/mx35_3stack_mmc.h +++ b/include/configs/mx35_3stack_mmc.h @@ -123,6 +123,7 @@ #define CONFIG_HAS_ETH1 #define CONFIG_NET_MULTI 1 +#define CONFIG_ETHPRIME #define CONFIG_MXC_FEC #define CONFIG_MII #define CONFIG_DISCOVER_PHY @@ -201,7 +201,7 @@ int eth_initialize(bd_t *bis) #endif /* Try board-specific initialization first. If it fails or isn't * present, try the cpu-specific initialization */ -#ifdef CONFIG_ETH_PRIME +#ifdef CONFIG_ETHPRIME board_eth_init(bis); cpu_eth_init(bis); #else |