summaryrefslogtreecommitdiff
path: root/cpu/ppc4xx
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 /cpu/ppc4xx
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>
Diffstat (limited to 'cpu/ppc4xx')
-rw-r--r--cpu/ppc4xx/cpu.c14
1 files changed, 14 insertions, 0 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;
+}
+