minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-09 03:58:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved initialization of Blackfin EMAC Ethernet controller to board_eth_init()

Browse Source 
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>
This commit is contained in:
Ben Warren 2008-07-11 23:15:28 -07:00
parent fc363ce354
commit 914947313a
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
board/bf537-stamp/bf537-stamp.c
View File

@ -154,6 +154,16 @@ int misc_init_r(void)
} }
#endif /* CONFIG_MISC_INIT_R */ #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 #ifdef CONFIG_POST
/* Using sw10-PF5 as the hotkey */ /* Using sw10-PF5 as the hotkey */
int post_hotkeys_pressed(void) int post_hotkeys_pressed(void)

2
drivers/net/bfin_mac.c
View File

@ -88,7 +88,7 @@ int bfin_EMAC_initialize(bd_t *bis)
eth_register(dev); eth_register(dev);
return 1; return 0;
} }
static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet, static int bfin_EMAC_send(struct eth_device *dev, volatile void *packet,

4
net/eth.c
View File

@ -68,7 +68,6 @@ extern int tsi108_eth_initialize(bd_t*);
extern int uli526x_initialize(bd_t *); extern int uli526x_initialize(bd_t *);
extern int npe_initialize(bd_t *); extern int npe_initialize(bd_t *);
extern int uec_initialize(int); extern int uec_initialize(int);
extern int bfin_EMAC_initialize(bd_t *);
extern int at91sam9_eth_initialize(bd_t *); extern int at91sam9_eth_initialize(bd_t *);
#ifdef CONFIG_API #ifdef CONFIG_API
@ -263,9 +262,6 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_RTL8169) #if defined(CONFIG_RTL8169)
rtl8169_initialize(bis); rtl8169_initialize(bis);
#endif #endif
#if defined(CONFIG_BF537)
bfin_EMAC_initialize(bis);
#endif
#if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \
defined(CONFIG_AT91SAM9263) defined(CONFIG_AT91SAM9263)
at91sam9_eth_initialize(bis); at91sam9_eth_initialize(bis);