commit 82c2c6aabe6fad2cc4b6960636cbabaf1f2a8c7d
author Ben Warren <biggerbadderben@gmail.com> Fri Jul 11 23:15:28 2008 -0700
committer Ben Warren <biggerbadderben@gmail.com> Tue Aug 26 22:17:36 2008 -0700
tree 696bb8c7426f1be5847d2ff8cb00c3e75da8a505
parent 8c042b6612c4e075e9d8b08f57a7a267e1d6b13e

Moved initialization of Blackfin EMAC Ethernet controller to board_eth_init()

Added board_eth_init() function to bf537-stamp board.
Removed initialization for the Blackin EMAC driver from net/eth.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

board/bf537-stamp/bf537-stamp.c

diff --git a/board/bf537-stamp/bf537-stamp.c b/board/bf537-stamp/bf537-stamp.c
index cd7a04d..a9b7a68 100644
--- a/board/bf537-stamp/bf537-stamp.c
+++ b/board/bf537-stamp/bf537-stamp.c
@@ -154,6 +154,16 @@
 }
 #endif				/* CONFIG_MISC_INIT_R */
 
+#if defined(CONFIG_BFIN_MAC)
+
+extern int bfin_EMAC_initialize(bd_t *bis);
+
+int board_eth_init(bd_t *bis)
+{
+	return bfin_EMAC_initialize(bis);
+}
+#endif
+
 #ifdef CONFIG_POST
 /* Using sw10-PF5 as the hotkey */
 int post_hotkeys_pressed(void)

drivers/net/bfin_mac.c

diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c
index fe56949..3ee5d96 100644
--- a/drivers/net/bfin_mac.c
+++ b/drivers/net/bfin_mac.c
@@ -88,7 +88,7 @@
 
 	eth_register(dev);
 
-	return 1;
+	return 0;
 }
 
 static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet,

net/eth.c

diff --git a/net/eth.c b/net/eth.c
index c40a19c..1db9ab5 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -68,7 +68,6 @@
 extern int uli526x_initialize(bd_t *);
 extern int npe_initialize(bd_t *);
 extern int uec_initialize(int);
-extern int bfin_EMAC_initialize(bd_t *);
 extern int at91sam9_eth_initialize(bd_t *);
 
 #ifdef CONFIG_API
@@ -263,9 +262,6 @@
 #if defined(CONFIG_RTL8169)
 	rtl8169_initialize(bis);
 #endif
-#if defined(CONFIG_BF537)
-	bfin_EMAC_initialize(bis);
-#endif
 #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
     defined(CONFIG_AT91SAM9263)
 	at91sam9_eth_initialize(bis);