summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-10-27 23:53:17 -0700
committerBen Warren <biggerbadderben@gmail.com>2008-11-09 21:38:05 -0800
commit25a859066b3af1070eb69f12022113c0a91bd813 (patch)
tree9cb9b2af865c67c3ee55fb39eb4edfa26f81ed26
parent4d03a4e20e58552cb96d61a0e8b56cdb6cc60126 (diff)
downloadu-boot-imx-25a859066b3af1070eb69f12022113c0a91bd813.zip
u-boot-imx-25a859066b3af1070eb69f12022113c0a91bd813.tar.gz
u-boot-imx-25a859066b3af1070eb69f12022113c0a91bd813.tar.bz2
Moved initialization of PPC4xx EMAC to cpu_eth_init()
Removed initialization of the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com> Acked-by: Stefan Roese <sr@denx.de>
-rw-r--r--cpu/ppc4xx/cpu.c14
-rw-r--r--include/netdev.h1
-rw-r--r--net/eth.c4
3 files changed, 15 insertions, 4 deletions
diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c
index a676b30..1f0b56c 100644
--- a/cpu/ppc4xx/cpu.c
+++ b/cpu/ppc4xx/cpu.c
@@ -36,6 +36,7 @@
#include <command.h>
#include <asm/cache.h>
#include <ppc4xx.h>
+#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -693,3 +694,16 @@ void reset_4xx_watchdog(void)
mtspr(tsr, 0x40000000);
}
#endif /* CONFIG_WATCHDOG */
+
+/*
+ * Initializes on-chip ethernet controllers.
+ * to override, implement board_eth_init()
+ */
+int cpu_eth_init(bd_t *bis)
+{
+#if defined(CONFIG_PPC4xx_EMAC)
+ ppc_4xx_eth_initialize(bis);
+#endif
+ return 0;
+}
+
diff --git a/include/netdev.h b/include/netdev.h
index 45e59b6..751f0da 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -62,6 +62,7 @@ int npe_initialize(bd_t *bis);
int ns8382x_initialize(bd_t *bis);
int pcnet_initialize(bd_t *bis);
int plb2800_eth_initialize(bd_t *bis);
+int ppc_4xx_eth_initialize (bd_t *bis);
int rtl8139_initialize(bd_t *bis);
int rtl8169_initialize(bd_t *bis);
int scc_initialize(bd_t *bis);
diff --git a/net/eth.c b/net/eth.c
index eab5104..b7ef09f 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -41,7 +41,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 *);
#ifdef CONFIG_API
extern void (*push_packet)(volatile void *, int);
@@ -153,9 +152,6 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_DB64460) || defined(CONFIG_P3Mx)
mv6446x_eth_initialize(bis);
#endif
-#if defined(CONFIG_PPC4xx_EMAC)
- ppc_4xx_eth_initialize(bis);
-#endif
if (!eth_devices) {
puts ("No ethernet found.\n");
show_boot_progress (-64);