From 3456a148276d5494b53ee40242efb6462d163504 Mon Sep 17 00:00:00 2001
From: Ben Warren <biggerbadderben@gmail.com>
Date: Wed, 22 Oct 2008 23:20:29 -0700
Subject: [PATCH] Moved initialization of FCC Ethernet controller to
 cpu_eth_init

Affected boards:
    Several MPC8xx boards
    Several MPC8260/MPC8272 boards
    Several MPC85xx boards

Removed initialization of the driver from net/eth.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
---
 cpu/mpc8260/cpu.c | 13 +++++++++++++
 cpu/mpc85xx/cpu.c |  5 ++++-
 cpu/mpc8xx/cpu.c  | 13 +++++++++++++
 include/netdev.h  |  1 +
 net/eth.c         |  5 -----
 5 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c
index 9f834d3e5a..b9e748ab8b 100644
--- a/cpu/mpc8260/cpu.c
+++ b/cpu/mpc8260/cpu.c
@@ -44,6 +44,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <mpc8260.h>
+#include <netdev.h>
 #include <asm/processor.h>
 #include <asm/cpm_8260.h>
 
@@ -315,3 +316,15 @@ void ft_cpu_setup (void *blob, bd_t *bd)
 	do_fixup_by_path_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1);
 }
 #endif /* CONFIG_OF_LIBFDT */
+
+/*
+ * Initializes on-chip ethernet controllers.
+ * to override, implement board_eth_init()
+ */
+int cpu_eth_init(bd_t *bis)
+{
+#if defined(CONFIG_ETHER_ON_FCC)
+	fec_initialize(bis);
+#endif
+	return 0;
+}
diff --git a/cpu/mpc85xx/cpu.c b/cpu/mpc85xx/cpu.c
index b90871d22c..fc6bd2d213 100644
--- a/cpu/mpc85xx/cpu.c
+++ b/cpu/mpc85xx/cpu.c
@@ -30,6 +30,7 @@
 #include <watchdog.h>
 #include <command.h>
 #include <tsec.h>
+#include <netdev.h>
 #include <asm/cache.h>
 #include <asm/io.h>
 
@@ -383,9 +384,11 @@ void upmconfig (uint upm, uint * table, uint size)
  */
 int cpu_eth_init(bd_t *bis)
 {
+#if defined(CONFIG_ETHER_ON_FCC)
+	fec_initialize(bis);
+#endif
 #if defined(CONFIG_TSEC_ENET) || defined(CONFIG_MPC85XX_FEC)
 	tsec_standard_init(bis);
 #endif
-
 	return 0;
 }
diff --git a/cpu/mpc8xx/cpu.c b/cpu/mpc8xx/cpu.c
index 420eaedf50..de3d67960e 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 <netdev.h>
 #include <asm/cache.h>
 
 #if defined(CONFIG_OF_LIBFDT)
@@ -635,3 +636,15 @@ void reset_8xx_watchdog (volatile immap_t * immr)
 # endif /* CONFIG_LWMON */
 }
 #endif /* CONFIG_WATCHDOG */
+
+/*
+ * Initializes on-chip ethernet controllers.
+ * to override, implement board_eth_init()
+ */
+int cpu_eth_init(bd_t *bis)
+{
+#if defined(FEC_ENET)
+	fec_initialize(bis);
+#endif
+	return 0;
+}
diff --git a/include/netdev.h b/include/netdev.h
index 31115e2b2b..0d1b0d5170 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -47,6 +47,7 @@ int dc21x4x_initialize(bd_t *bis);
 int e1000_initialize(bd_t *bis);
 int eepro100_initialize(bd_t *bis);
 int eth_3com_initialize (bd_t * bis);
+int fec_initialize (bd_t *bis);
 int greth_initialize(bd_t *bis);
 void gt6426x_eth_initialize(bd_t *bis);
 int inca_switch_initialize(bd_t *bis);
diff --git a/net/eth.c b/net/eth.c
index 72fed69891..6cf53f4a4c 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -39,7 +39,6 @@ static int __def_eth_init(bd_t *bis)
 int cpu_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
 int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
 
-extern int fec_initialize(bd_t*);
 extern int mpc8220_fec_initialize(bd_t*);
 extern int mv6436x_eth_initialize(bd_t *);
 extern int mv6446x_eth_initialize(bd_t *);
@@ -184,10 +183,6 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_UEC_ETH6)
 	uec_initialize(5);
 #endif
-
-#if defined(FEC_ENET) || defined(CONFIG_ETHER_ON_FCC)
-	fec_initialize(bis);
-#endif
 	if (!eth_devices) {
 		puts ("No ethernet found.\n");
 		show_boot_progress (-64);
-- 
2.25.1