V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Moved initialization of NATSEMI Ethernet controller to board_eth_init() 

Affected boards:
	a3000

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-08-31 10:07:16 -07:00
parent 19403633dd
commit b902b8dda5
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
board/a3000/a3000.c
View File

@ -27,6 +27,7 @@
#include <common.h> #include <common.h>
#include <mpc824x.h> #include <mpc824x.h>
#include <pci.h> #include <pci.h>
#include <netdev.h>
int checkboard (void) int checkboard (void)
{ {
@ -109,3 +110,9 @@ void pci_init_board(void)
{ {
pci_mpc824x_init(&hose); pci_mpc824x_init(&hose);
} }
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}

1
drivers/net/natsemi.c
View File

@ -53,6 +53,7 @@
#include <common.h> #include <common.h>
#include <malloc.h> #include <malloc.h>
#include <net.h> #include <net.h>
#include <netdev.h>
#include <asm/io.h> #include <asm/io.h>
#include <pci.h> #include <pci.h>

4
include/netdev.h
View File

@ -46,6 +46,7 @@ int greth_initialize(bd_t *bis);
int macb_eth_initialize(int id, void *regs, unsigned int phy_addr); int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
int mcdmafec_initialize(bd_t *bis); int mcdmafec_initialize(bd_t *bis);
int mcffec_initialize(bd_t *bis); int mcffec_initialize(bd_t *bis);
int natsemi_initialize(bd_t *bis);
int ns8382x_initialize(bd_t *bis); int ns8382x_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);
@ -60,6 +61,9 @@ int uli526x_initialize(bd_t *bis);
static inline int pci_eth_init(bd_t *bis) static inline int pci_eth_init(bd_t *bis)
{ {
int num = 0; int num = 0;
#ifdef CONFIG_NATSEMI
num += natsemi_initialize(bis);
#endif
#ifdef CONFIG_NS8382X #ifdef CONFIG_NS8382X
num += ns8382x_initialize(bis); num += ns8382x_initialize(bis);
#endif #endif

4
net/eth.c
View File

@ -55,7 +55,6 @@ extern int mpc512x_fec_initialize(bd_t*);
extern int mpc8220_fec_initialize(bd_t*); extern int mpc8220_fec_initialize(bd_t*);
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 natsemi_initialize(bd_t*);
extern int pcnet_initialize(bd_t*); extern int pcnet_initialize(bd_t*);
extern int plb2800_eth_initialize(bd_t*); extern int plb2800_eth_initialize(bd_t*);
extern int ppc_4xx_eth_initialize(bd_t *); extern int ppc_4xx_eth_initialize(bd_t *);
@ -233,9 +232,6 @@ int eth_initialize(bd_t *bis)
#endif #endif
#ifdef CFG_GT_6426x #ifdef CFG_GT_6426x
gt6426x_eth_initialize(bis); gt6426x_eth_initialize(bis);
#endif
#ifdef CONFIG_NATSEMI
natsemi_initialize(bis);
#endif #endif
if (!eth_devices) { if (!eth_devices) {
puts ("No ethernet found.\n"); puts ("No ethernet found.\n");