leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved initialization of PPC4xx EMAC to cpu_eth_init()

Browse Source 
Removed initialization of the driver from net/eth.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Acked-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Ben Warren 2008-10-27 23:53:17 -07:00
parent 4d03a4e20e
commit 25a859066b
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cpu/ppc4xx/cpu.c
View File

@ -36,6 +36,7 @@
#include <command.h> #include <command.h>
#include <asm/cache.h> #include <asm/cache.h>
#include <ppc4xx.h> #include <ppc4xx.h>
#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -693,3 +694,16 @@ void reset_4xx_watchdog(void)
mtspr(tsr, 0x40000000); mtspr(tsr, 0x40000000);
} }
#endif /* CONFIG_WATCHDOG */ #endif /* CONFIG_WATCHDOG */
/*
* Initializes on-chip ethernet controllers.
* to override, implement board_eth_init()
*/
int cpu_eth_init(bd_t *bis)
{
#if defined(CONFIG_PPC4xx_EMAC)
ppc_4xx_eth_initialize(bis);
#endif
return 0;
}

1
include/netdev.h
View File

@ -62,6 +62,7 @@ int npe_initialize(bd_t *bis);
int ns8382x_initialize(bd_t *bis); int ns8382x_initialize(bd_t *bis);
int pcnet_initialize(bd_t *bis); int pcnet_initialize(bd_t *bis);
int plb2800_eth_initialize(bd_t *bis); int plb2800_eth_initialize(bd_t *bis);
int ppc_4xx_eth_initialize (bd_t *bis);
int rtl8139_initialize(bd_t *bis); int rtl8139_initialize(bd_t *bis);
int rtl8169_initialize(bd_t *bis); int rtl8169_initialize(bd_t *bis);
int scc_initialize(bd_t *bis); int scc_initialize(bd_t *bis);

4
net/eth.c
View File

@ -41,7 +41,6 @@ int board_eth_init(bd_t *bis) __attribute((weak, alias("__def_eth_init")));
extern int mv6436x_eth_initialize(bd_t *); extern int mv6436x_eth_initialize(bd_t *);
extern int mv6446x_eth_initialize(bd_t *); extern int mv6446x_eth_initialize(bd_t *);
extern int ppc_4xx_eth_initialize(bd_t *);
#ifdef CONFIG_API #ifdef CONFIG_API
extern void (*push_packet)(volatile void *, int); extern void (*push_packet)(volatile void *, int);
@ -152,9 +151,6 @@ int eth_initialize(bd_t *bis)
#endif #endif
#if defined(CONFIG_DB64460) || defined(CONFIG_P3Mx) #if defined(CONFIG_DB64460) || defined(CONFIG_P3Mx)
mv6446x_eth_initialize(bis); mv6446x_eth_initialize(bis);
#endif
#if defined(CONFIG_PPC4xx_EMAC)
ppc_4xx_eth_initialize(bis);
#endif #endif
if (!eth_devices) { if (!eth_devices) {
puts ("No ethernet found.\n"); puts ("No ethernet found.\n");