[PATCH v2 12/17] 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: Ben Warren <biggerbadderben <at> gmail.com>
---
 cpu/mpc512x/cpu.c         |   13 +++++++++++++
 drivers/net/mpc512x_fec.c |    1 +
 include/netdev.h          |    1 +
 net/eth.c                 |    4 ----
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c
index 1f39ac4..d432d99 100644
--- a/cpu/mpc512x/cpu.c
+++ b/cpu/mpc512x/cpu.c
 <at>  <at>  -30,6 +30,7  <at>  <at> 
 #include <common.h>
 #include <command.h>
 #include <mpc512x.h>
+#include <netdev.h>
 #include <asm/processor.h>

 #if defined(CONFIG_OF_LIBFDT)
 <at>  <at>  -195,3 +196,15  <at>  <at>  void ft_cpu_setup(void *blob, bd_t *bd)
 #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
diff --git a/drivers/net/mpc512x_fec.c b/drivers/net/mpc512x_fec.c
index 7caeeda..54283fb 100644
--- a/drivers/net/mpc512x_fec.c
+++ b/drivers/net/mpc512x_fec.c
 <at>  <at>  -10,6 +10,7  <at>  <at> 
 #include <mpc512x.h>
 #include <malloc.h>
 #include <net.h>
+#include <netdev.h>
 #include <miiphy.h>
 #include "mpc512x_fec.h"

diff --git a/include/netdev.h b/include/netdev.h
index f28039e..487d319 100644
--- a/include/netdev.h
+++ b/include/netdev.h
 <at>  <at>  -49,6 +49,7  <at>  <at>  int inca_switch_initialize(bd_t *bis);
 int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
 int mcdmafec_initialize(bd_t *bis);
 int mcffec_initialize(bd_t *bis);
+int mpc512x_fec_initialize(bd_t *bis);
 int natsemi_initialize(bd_t *bis);
 int ns8382x_initialize(bd_t *bis);
 int pcnet_initialize(bd_t *bis);
diff --git a/net/eth.c b/net/eth.c
index 0dfa70d..b61d0fc 100644
--- a/net/eth.c
+++ b/net/eth.c
 <at>  <at>  -45,7 +45,6  <at>  <at>  extern int e1000_initialize(bd_t*);
 extern int eepro100_initialize(bd_t*);
 extern int 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 mv6436x_eth_initialize(bd_t *);
 extern int mv6446x_eth_initialize(bd_t *);
 <at>  <at>  -177,9 +176,6  <at>  <at>  int eth_initialize(bd_t *bis)
 #if defined(CONFIG_MPC5xxx_FEC)
 	mpc5xxx_fec_initialize(bis);
 #endif
-#if defined(CONFIG_MPC512x_FEC)
-	mpc512x_fec_initialize (bis);
-#endif
 #if defined(CONFIG_MPC8220_FEC)
 	mpc8220_fec_initialize(bis);
 #endif
--

-- 
1.5.4.3