Moved initialization of GRETH Ethernet driver to CPU directory

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>
master
Ben Warren 17 years ago
parent 86882b8077
commit fc363ce354
  1. 9
      cpu/leon2/cpu.c
  2. 8
      cpu/leon3/cpu.c
  3. 2
      drivers/net/greth.c
  4. 4
      net/eth.c

@ -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

@ -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

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

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

Loading…
Cancel
Save