summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-10-23 22:02:49 -0700
committerBen Warren <biggerbadderben@gmail.com>2008-11-09 21:38:03 -0800
commit9eb79bd8856bcab896ed5e1f1bca159807a124dd (patch)
tree7c8e643d46ee8ef95b0f254236073e8694797aa9
parenta9bec96d6359ac9f90a852962bf3040cad9e0256 (diff)
downloadu-boot-imx-9eb79bd8856bcab896ed5e1f1bca159807a124dd.zip
u-boot-imx-9eb79bd8856bcab896ed5e1f1bca159807a124dd.tar.gz
u-boot-imx-9eb79bd8856bcab896ed5e1f1bca159807a124dd.tar.bz2
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>
-rw-r--r--cpu/mpc8xx/cpu.c4
-rw-r--r--include/netdev.h1
-rw-r--r--net/eth.c4
3 files changed, 5 insertions, 4 deletions
diff --git a/cpu/mpc8xx/cpu.c b/cpu/mpc8xx/cpu.c
index de3d679..40f81ef 100644
--- 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 55183e8..45e59b6 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 d543163..0b954ed 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);
@@ -157,9 +156,6 @@ int eth_initialize(bd_t *bis)
#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");
show_boot_progress (-64);