From 9eb79bd8856bcab896ed5e1f1bca159807a124dd Mon Sep 17 00:00:00 2001 From: Ben Warren Date: Thu, 23 Oct 2008 22:02:49 -0700 Subject: Moved initialization of MPC8XX SCC to cpu_eth_init() Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren --- cpu/mpc8xx/cpu.c | 4 ++++ include/netdev.h | 1 + net/eth.c | 4 ---- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cpu/mpc8xx/cpu.c b/cpu/mpc8xx/cpu.c index de3d67960e..40f81efc3c 100644 --- a/cpu/mpc8xx/cpu.c +++ b/cpu/mpc8xx/cpu.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -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 55183e87a1..45e59b6f62 100644 --- 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 d5431639ae..0b954edb78 100644 --- 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"); -- cgit