Moved initialization of MPC8XX SCC to cpu_eth_init()

Removed initialization of the driver from net/eth.c

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

diff --git a/cpu/mpc8xx/cpu.c b/cpu/mpc8xx/cpu.c
index de3d67960eb414cd464f6ff075b12c16a8f62fc4..40f81efc3c6eaf968e5f3020ba1767606cd20ebb 100644 (file)
--- a/cpu/mpc8xx/cpu.c
+++ b/cpu/mpc8xx/cpu.c
@@ -37,6 +37,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <mpc8xx.h>
+#include <commproc.h>
 #include <netdev.h>
 #include <asm/cache.h>
 
@@ -643,6 +644,9 @@ void reset_8xx_watchdog (volatile immap_t * immr)
  */
 int cpu_eth_init(bd_t *bis)
 {
+#if defined(SCC_ENET)
+       scc_initialize(bis);
+#endif
 #if defined(FEC_ENET)
        fec_initialize(bis);
 #endif

diff --git a/include/netdev.h b/include/netdev.h
index 55183e87a14ded603aa6953e57c9a1a9c5b248f5..45e59b6f62378e4fbe0dda749d54d442e3bfa56a 100644 (file)
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -64,6 +64,7 @@ int pcnet_initialize(bd_t *bis);
 int plb2800_eth_initialize(bd_t *bis);
 int rtl8139_initialize(bd_t *bis);
 int rtl8169_initialize(bd_t *bis);
+int scc_initialize(bd_t *bis);
 int skge_initialize(bd_t *bis);
 int tsi108_eth_initialize(bd_t *bis);
 int uec_initialize(int index);

diff --git a/net/eth.c b/net/eth.c
index d5431639aee7d24ea06993a2115c7c7bd454d43f..0b954edb78c020c70e7b369c4135083499166b56 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -42,7 +42,6 @@ int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
 extern int mv6436x_eth_initialize(bd_t *);
 extern int mv6446x_eth_initialize(bd_t *);
 extern int ppc_4xx_eth_initialize(bd_t *);
-extern int scc_initialize(bd_t*);
 
 #ifdef CONFIG_API
 extern void (*push_packet)(volatile void *, int);
@@ -156,9 +155,6 @@ int eth_initialize(bd_t *bis)
 #endif
 #if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) && !defined(CONFIG_AP1000)
        ppc_4xx_eth_initialize(bis);
-#endif
-#ifdef SCC_ENET
-       scc_initialize(bis);
 #endif
        if (!eth_devices) {
                puts ("No ethernet found.\n");