mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-17 12:41:32 +00:00
Moved initialization of MPC8220 FEC to cpu_eth_init()
Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
parent
0e8454e990
commit
a9bec96d63
4 changed files with 16 additions and 4 deletions
|
@ -62,5 +62,7 @@ void pci_init_board (void)
|
|||
|
||||
int board_eth_init(bd_t *bis)
|
||||
{
|
||||
/* Initialize built-in FEC first */
|
||||
cpu_eth_init(bis);
|
||||
return pci_eth_init(bis);
|
||||
}
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <watchdog.h>
|
||||
#include <command.h>
|
||||
#include <mpc8220.h>
|
||||
#include <netdev.h>
|
||||
#include <asm/processor.h>
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
@ -89,3 +90,15 @@ unsigned long get_tbclk (void)
|
|||
}
|
||||
|
||||
/* ------------------------------------------------------------------------- */
|
||||
|
||||
/*
|
||||
* Initializes on-chip ethernet controllers.
|
||||
* to override, implement board_eth_init()
|
||||
*/
|
||||
int cpu_eth_init(bd_t *bis)
|
||||
{
|
||||
#if defined(CONFIG_MPC8220_FEC)
|
||||
mpc8220_fec_initialize(bis);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -56,6 +56,7 @@ int mcdmafec_initialize(bd_t *bis);
|
|||
int mcffec_initialize(bd_t *bis);
|
||||
int mpc512x_fec_initialize(bd_t *bis);
|
||||
int mpc5xxx_fec_initialize(bd_t *bis);
|
||||
int mpc8220_fec_initialize(bd_t *bis);
|
||||
int natsemi_initialize(bd_t *bis);
|
||||
int npe_initialize(bd_t *bis);
|
||||
int ns8382x_initialize(bd_t *bis);
|
||||
|
|
|
@ -39,7 +39,6 @@ static int __def_eth_init(bd_t *bis)
|
|||
int cpu_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
|
||||
int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
|
||||
|
||||
extern int mpc8220_fec_initialize(bd_t*);
|
||||
extern int mv6436x_eth_initialize(bd_t *);
|
||||
extern int mv6446x_eth_initialize(bd_t *);
|
||||
extern int ppc_4xx_eth_initialize(bd_t *);
|
||||
|
@ -160,9 +159,6 @@ int eth_initialize(bd_t *bis)
|
|||
#endif
|
||||
#ifdef SCC_ENET
|
||||
scc_initialize(bis);
|
||||
#endif
|
||||
#if defined(CONFIG_MPC8220_FEC)
|
||||
mpc8220_fec_initialize(bis);
|
||||
#endif
|
||||
if (!eth_devices) {
|
||||
puts ("No ethernet found.\n");
|
||||
|
|
Loading…
Add table
Reference in a new issue