Moved initialization of FSL_MCDMAFEC Ethernet driver to CPU directory

Added a cpu_eth_init() function to cpu/mcf547x_8x directory and
removed code from net/eth.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

diff --git a/cpu/mcf547x_8x/cpu.c b/cpu/mcf547x_8x/cpu.c
index 528bca6bf9deb7071f8b8b661422bb99bf39c556..e29b45c4ccd15a7da6c563cafbcb02d201383647 100644 (file)
--- a/cpu/mcf547x_8x/cpu.c
+++ b/cpu/mcf547x_8x/cpu.c
@@ -141,3 +141,12 @@ int watchdog_init(void)
        return (0);
 }
 #endif                         /* CONFIG_HW_WATCHDOG */
+
+#if defined(CONFIG_FSLDMAFEC)
+extern int mcdmafec_initialize(bd_t *bis);
+
+int cpu_eth_init(bd_t *bis)
+{
+       return mcdmafec_initialize(bis);
+}
+#endif

diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c
index f2bdba6184c03fd5b59a1e824f87d31dc6fac9f2..e34975a12fa517051352be340a3882fd86fce41a 100644 (file)
--- a/drivers/net/fsl_mcdmafec.c
+++ b/drivers/net/fsl_mcdmafec.c
@@ -582,5 +582,5 @@ int mcdmafec_initialize(bd_t * bis)
        /* default speed */
        bis->bi_ethspeed = 10;
 
-       return 1;
+       return 0;
 }

diff --git a/net/eth.c b/net/eth.c
index 8e83b66c0a619bf316d6607a1f3ac833ef4e0fb2..bc57ca3e89fa274ddcaf30b6f215934980aeef01 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -71,7 +71,6 @@ extern int uec_initialize(int);
 extern int bfin_EMAC_initialize(bd_t *);
 extern int greth_initialize(bd_t *);
 extern int mcffec_initialize(bd_t*);
-extern int mcdmafec_initialize(bd_t*);
 extern int at91sam9_eth_initialize(bd_t *);
 
 #ifdef CONFIG_API
@@ -275,9 +274,6 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_MCFFEC)
        mcffec_initialize(bis);
 #endif
-#if defined(CONFIG_FSLDMAFEC)
-       mcdmafec_initialize(bis);
-#endif
 #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
     defined(CONFIG_AT91SAM9263)
        at91sam9_eth_initialize(bis);