redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

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>
utp
Ben Warren 2008-10-22 23:32:48 -07:00
parent 3456a14827
commit 0e8454e990
4 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cpu/mpc83xx/cpu.c
View File

@ -33,6 +33,7 @@
#include <asm/processor.h> #include <asm/processor.h>
#include <libfdt.h> #include <libfdt.h>
#include <tsec.h> #include <tsec.h>
#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -361,9 +362,26 @@ int dma_xfer(void *dest, u32 count, void *src)
*/ */
int cpu_eth_init(bd_t *bis) 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) #if defined(CONFIG_TSEC_ENET)
tsec_standard_init(bis); tsec_standard_init(bis);
#endif #endif
return 0; return 0;
} }

18
cpu/mpc85xx/cpu.c
View File

@ -387,6 +387,24 @@ int cpu_eth_init(bd_t *bis)
#if defined(CONFIG_ETHER_ON_FCC) #if defined(CONFIG_ETHER_ON_FCC)
fec_initialize(bis); fec_initialize(bis);
#endif #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) #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_MPC85XX_FEC)
tsec_standard_init(bis); tsec_standard_init(bis);
#endif #endif

1
include/netdev.h
View File

@ -65,6 +65,7 @@ int rtl8139_initialize(bd_t *bis);
int rtl8169_initialize(bd_t *bis); int rtl8169_initialize(bd_t *bis);
int skge_initialize(bd_t *bis); int skge_initialize(bd_t *bis);
int tsi108_eth_initialize(bd_t *bis); int tsi108_eth_initialize(bd_t *bis);
int uec_initialize(int index);
int uli526x_initialize(bd_t *bis); int uli526x_initialize(bd_t *bis);
/* Boards with PCI network controllers can call this from their board_eth_init() /* Boards with PCI network controllers can call this from their board_eth_init()

19
net/eth.c
View File

@ -44,7 +44,6 @@ extern int mv6436x_eth_initialize(bd_t *);
extern int mv6446x_eth_initialize(bd_t *); extern int mv6446x_eth_initialize(bd_t *);
extern int ppc_4xx_eth_initialize(bd_t *); extern int ppc_4xx_eth_initialize(bd_t *);
extern int scc_initialize(bd_t*); extern int scc_initialize(bd_t*);
extern int uec_initialize(int);
#ifdef CONFIG_API #ifdef CONFIG_API
extern void (*push_packet)(volatile void *, int); extern void (*push_packet)(volatile void *, int);
@ -164,24 +163,6 @@ int eth_initialize(bd_t *bis)
#endif #endif
#if defined(CONFIG_MPC8220_FEC) #if defined(CONFIG_MPC8220_FEC)
mpc8220_fec_initialize(bis); mpc8220_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 #endif
if (!eth_devices) { if (!eth_devices) {
puts ("No ethernet found.\n"); puts ("No ethernet found.\n");