GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 21:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved initialization of GRETH Ethernet driver to CPU directory

Browse source 
Added a cpu_eth_init() function to leon2/leon3 CPU directories and
removed code from net/eth.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Ben Warren 2008-07-09 01:04:19 -07:00
parent 86882b8077
commit fc363ce354
4 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cpu/leon2/cpu.c
View file

@ -56,3 +56,12 @@ int do_reset(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
extern int greth_initialize(bd_t *bis);
#ifdef CONFIG_GRETH
int cpu_eth_init(bd_t *bis)
{
return greth_initialize(bis);
}
#endif

8
cpu/leon3/cpu.c
View file

@ -65,3 +65,11 @@ u64 flash_read64(void *addr)
} }
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
extern int greth_initialize(bd_t *bis);
#ifdef CONFIG_GRETH
int cpu_eth_init(bd_t *bis)
{
return greth_initialize(bis);
}
#endif

2
drivers/net/greth.c
View file

@ -657,5 +657,5 @@ int greth_initialize(bd_t * bis)
/* set and remember MAC address */ /* set and remember MAC address */
greth_set_hwaddr(greth, addr); greth_set_hwaddr(greth, addr);
return 1; return 0;
} }

4
net/eth.c
View file

@ -69,7 +69,6 @@ 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 bfin_EMAC_initialize(bd_t *);
extern int greth_initialize(bd_t *);
extern int at91sam9_eth_initialize(bd_t *); extern int at91sam9_eth_initialize(bd_t *);
#ifdef CONFIG_API #ifdef CONFIG_API
@ -267,9 +266,6 @@ int eth_initialize(bd_t *bis)
#if defined(CONFIG_BF537) #if defined(CONFIG_BF537)
bfin_EMAC_initialize(bis); bfin_EMAC_initialize(bis);
#endif #endif
#if defined(CONFIG_GRETH)
greth_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);