GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 18:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Moved initialization of MPC8XX SCC to cpu_eth_init()

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

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
This commit is contained in:
Ben Warren 2008-10-23 22:02:49 -07:00
parent a9bec96d63
commit 9eb79bd885
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cpu/mpc8xx/cpu.c
View file

@ -37,6 +37,7 @@
#include <watchdog.h> #include <watchdog.h>
#include <command.h> #include <command.h>
#include <mpc8xx.h> #include <mpc8xx.h>
#include <commproc.h>
#include <netdev.h> #include <netdev.h>
#include <asm/cache.h> #include <asm/cache.h>
@ -643,6 +644,9 @@ void reset_8xx_watchdog (volatile immap_t * immr)
*/ */
int cpu_eth_init(bd_t *bis) int cpu_eth_init(bd_t *bis)
{ {
#if defined(SCC_ENET)
scc_initialize(bis);
#endif
#if defined(FEC_ENET) #if defined(FEC_ENET)
fec_initialize(bis); fec_initialize(bis);
#endif #endif

1
include/netdev.h
View file

@ -64,6 +64,7 @@ int pcnet_initialize(bd_t *bis);
int plb2800_eth_initialize(bd_t *bis); int plb2800_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 skge_initialize(bd_t *bis); int skge_initialize(bd_t *bis);
int tsi108_eth_initialize(bd_t *bis); int tsi108_eth_initialize(bd_t *bis);
int uec_initialize(int index); int uec_initialize(int index);

4
net/eth.c
View file

@ -42,7 +42,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 *); extern int ppc_4xx_eth_initialize(bd_t *);
extern int scc_initialize(bd_t*);
#ifdef CONFIG_API #ifdef CONFIG_API
extern void (*push_packet)(volatile void *, int); extern void (*push_packet)(volatile void *, int);
@ -156,9 +155,6 @@ int eth_initialize(bd_t *bis)
#endif #endif
#if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) && !defined(CONFIG_AP1000) #if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) && !defined(CONFIG_AP1000)
ppc_4xx_eth_initialize(bis); ppc_4xx_eth_initialize(bis);
#endif
#ifdef SCC_ENET
scc_initialize(bis);
#endif #endif
if (!eth_devices) { if (!eth_devices) {
puts ("No ethernet found.\n"); puts ("No ethernet found.\n");