summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Warren <biggerbadderben@gmail.com>2008-07-11 23:42:19 -0700
committerBen Warren <biggerbadderben@gmail.com>2008-08-26 22:17:45 -0700
commit65d3d99c28dc363d15eaee78225ff643df499b97 (patch)
treef22c8f0166cc33a8ce1be97ee17178ba7700e685
parent914947313a710f5dcf06beaf7f2aa24f1ebcce4f (diff)
Moved initialization of ULI526X Ethernet driver to board code.
The only board using this driver is the Freescale MPC8610HPCD board. Removed initialization for the driver from net/eth.c Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
-rw-r--r--board/freescale/mpc8610hpcd/mpc8610hpcd.c10
-rw-r--r--net/eth.c4
2 files changed, 10 insertions, 4 deletions
diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
index c9dde4d1a..af79fc2c6 100644
--- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c
+++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c
@@ -519,3 +519,13 @@ get_board_sys_clk(ulong dummy)
return val;
}
+
+extern int uli526x_initialize(bd_t *);
+
+int board_eth_init(bd_t *bis)
+{
+#if defined(CONFIG_ULI526)
+ uli526x_initialize(bis);
+#endif
+ return 0;
+}
diff --git a/net/eth.c b/net/eth.c
index 1db9ab5fe..0ad9907f8 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -65,7 +65,6 @@ extern int rtl8169_initialize(bd_t*);
extern int scc_initialize(bd_t*);
extern int skge_initialize(bd_t*);
extern int tsi108_eth_initialize(bd_t*);
-extern int uli526x_initialize(bd_t *);
extern int npe_initialize(bd_t *);
extern int uec_initialize(int);
extern int at91sam9_eth_initialize(bd_t *);
@@ -253,9 +252,6 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_TSI108_ETH)
tsi108_eth_initialize(bis);
#endif
-#if defined(CONFIG_ULI526X)
- uli526x_initialize(bis);
-#endif
#if defined(CONFIG_RTL8139)
rtl8139_initialize(bis);
#endif