diff options
| author | Ben Warren <biggerbadderben@gmail.com> | 2008-10-22 23:32:48 -0700 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2008-11-09 21:38:03 -0800 |
| commit | 0e8454e990385a58f708c2fc26d31ac041c7a6c5 (patch) | |
| tree | cfb32d9c3976df9cdd12c9c35a6ba497dfe74f04 /cpu | |
| parent | 3456a148276d5494b53ee40242efb6462d163504 (diff) | |
| download | u-boot-imx-0e8454e990385a58f708c2fc26d31ac041c7a6c5.zip u-boot-imx-0e8454e990385a58f708c2fc26d31ac041c7a6c5.tar.gz u-boot-imx-0e8454e990385a58f708c2fc26d31ac041c7a6c5.tar.bz2 | |
Moved initialization of QE Ethernet controller to cpu_eth_init()
Removed initialization of the driver from net/eth.c
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'cpu')
| -rw-r--r-- | cpu/mpc83xx/cpu.c | 20 | ||||
| -rw-r--r-- | cpu/mpc85xx/cpu.c | 18 |
2 files changed, 37 insertions, 1 deletions
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index 5e885ab..587fca3 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -33,6 +33,7 @@ #include <asm/processor.h> #include <libfdt.h> #include <tsec.h> +#include <netdev.h> DECLARE_GLOBAL_DATA_PTR; @@ -361,9 +362,26 @@ int dma_xfer(void *dest, u32 count, void *src) */ int cpu_eth_init(bd_t *bis) { +#if defined(CONFIG_UEC_ETH1) + uec_initialize(0); +#endif +#if defined(CONFIG_UEC_ETH2) + uec_initialize(1); +#endif +#if defined(CONFIG_UEC_ETH3) + uec_initialize(2); +#endif +#if defined(CONFIG_UEC_ETH4) + uec_initialize(3); +#endif +#if defined(CONFIG_UEC_ETH5) + uec_initialize(4); +#endif +#if defined(CONFIG_UEC_ETH6) + uec_initialize(5); +#endif #if defined(CONFIG_TSEC_ENET) tsec_standard_init(bis); #endif - return 0; } diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c index fc6bd2d..943602f 100644 --- a/cpu/mpc85xx/cpu.c +++ b/cpu/mpc85xx/cpu.c @@ -387,6 +387,24 @@ int cpu_eth_init(bd_t *bis) #if defined(CONFIG_ETHER_ON_FCC) fec_initialize(bis); #endif +#if defined(CONFIG_UEC_ETH1) + uec_initialize(0); +#endif +#if defined(CONFIG_UEC_ETH2) + uec_initialize(1); +#endif +#if defined(CONFIG_UEC_ETH3) + uec_initialize(2); +#endif +#if defined(CONFIG_UEC_ETH4) + uec_initialize(3); +#endif +#if defined(CONFIG_UEC_ETH5) + uec_initialize(4); +#endif +#if defined(CONFIG_UEC_ETH6) + uec_initialize(5); +#endif #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_MPC85XX_FEC) tsec_standard_init(bis); #endif |