Commit a0aad08f authored by Ben Warren's avatar Ben Warren

Moved initialization of MPC512x_FEC Ethernet driver to CPU directory

Added a cpu_eth_init() function to MPC512x CPU directory and
removed code from net/eth.c
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
parent 8218bd2a
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <mpc512x.h> #include <mpc512x.h>
#include <netdev.h>
#include <asm/processor.h> #include <asm/processor.h>
#if defined(CONFIG_OF_LIBFDT) #if defined(CONFIG_OF_LIBFDT)
...@@ -195,3 +196,15 @@ void ft_cpu_setup(void *blob, bd_t *bd) ...@@ -195,3 +196,15 @@ void ft_cpu_setup(void *blob, bd_t *bd)
#endif #endif
} }
#endif #endif
#ifdef CONFIG_MPC512x_FEC
/* Default initializations for FEC controllers. To override,
* create a board-specific function called:
* int board_eth_init(bd_t *bis)
*/
int cpu_eth_init(bd_t *bis)
{
return mpc512x_fec_initialize(bis);
}
#endif
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <mpc512x.h> #include <mpc512x.h>
#include <malloc.h> #include <malloc.h>
#include <net.h> #include <net.h>
#include <netdev.h>
#include <miiphy.h> #include <miiphy.h>
#include "mpc512x_fec.h" #include "mpc512x_fec.h"
......
...@@ -49,6 +49,7 @@ int inca_switch_initialize(bd_t *bis); ...@@ -49,6 +49,7 @@ int inca_switch_initialize(bd_t *bis);
int macb_eth_initialize(int id, void *regs, unsigned int phy_addr); int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
int mcdmafec_initialize(bd_t *bis); int mcdmafec_initialize(bd_t *bis);
int mcffec_initialize(bd_t *bis); int mcffec_initialize(bd_t *bis);
int mpc512x_fec_initialize(bd_t *bis);
int natsemi_initialize(bd_t *bis); int natsemi_initialize(bd_t *bis);
int ns8382x_initialize(bd_t *bis); int ns8382x_initialize(bd_t *bis);
int pcnet_initialize(bd_t *bis); int pcnet_initialize(bd_t *bis);
......
...@@ -45,7 +45,6 @@ extern int e1000_initialize(bd_t*); ...@@ -45,7 +45,6 @@ extern int e1000_initialize(bd_t*);
extern int eepro100_initialize(bd_t*); extern int eepro100_initialize(bd_t*);
extern int fec_initialize(bd_t*); extern int fec_initialize(bd_t*);
extern int mpc5xxx_fec_initialize(bd_t*); extern int mpc5xxx_fec_initialize(bd_t*);
extern int mpc512x_fec_initialize(bd_t*);
extern int mpc8220_fec_initialize(bd_t*); extern int mpc8220_fec_initialize(bd_t*);
extern int mv6436x_eth_initialize(bd_t *); extern int mv6436x_eth_initialize(bd_t *);
extern int mv6446x_eth_initialize(bd_t *); extern int mv6446x_eth_initialize(bd_t *);
...@@ -177,9 +176,6 @@ int eth_initialize(bd_t *bis) ...@@ -177,9 +176,6 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_MPC5xxx_FEC) #if defined(CONFIG_MPC5xxx_FEC)
mpc5xxx_fec_initialize(bis); mpc5xxx_fec_initialize(bis);
#endif #endif
#if defined(CONFIG_MPC512x_FEC)
mpc512x_fec_initialize (bis);
#endif
#if defined(CONFIG_MPC8220_FEC) #if defined(CONFIG_MPC8220_FEC)
mpc8220_fec_initialize(bis); mpc8220_fec_initialize(bis);
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment