From 914947313a710f5dcf06beaf7f2aa24f1ebcce4f Mon Sep 17 00:00:00 2001 From: Ben Warren Date: Fri, 11 Jul 2008 23:15:28 -0700 Subject: [PATCH] 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 --- board/bf537-stamp/bf537-stamp.c | 10 ++++++++++ drivers/net/bfin_mac.c | 2 +- net/eth.c | 4 ---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/board/bf537-stamp/bf537-stamp.c b/board/bf537-stamp/bf537-stamp.c index cd7a04dbfa..a9b7a68c54 100644 --- a/board/bf537-stamp/bf537-stamp.c +++ b/board/bf537-stamp/bf537-stamp.c @@ -154,6 +154,16 @@ int misc_init_r(void) } #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) diff --git a/drivers/net/bfin_mac.c b/drivers/net/bfin_mac.c index fe56949989..3ee5d9603a 100644 --- a/drivers/net/bfin_mac.c +++ b/drivers/net/bfin_mac.c @@ -88,7 +88,7 @@ int bfin_EMAC_initialize(bd_t *bis) eth_register(dev); - return 1; + return 0; } static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet, diff --git a/net/eth.c b/net/eth.c index c40a19ce2e..1db9ab5fe8 100644 --- a/net/eth.c +++ b/net/eth.c @@ -68,7 +68,6 @@ 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 bfin_EMAC_initialize(bd_t *); extern int at91sam9_eth_initialize(bd_t *); #ifdef CONFIG_API @@ -263,9 +262,6 @@ int eth_initialize(bd_t *bis) #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); -- 2.39.5