Commit e3090534 authored by Ben Warren's avatar Ben Warren

Moved initialization of PCNET Ethernet controller to board_eth_init()

Affected boards:
	PN62
	sc520_cdp

Removed initialization of the driver from net/eth.c
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
parent b902b8dd
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
#include <common.h> #include <common.h>
#include <mpc824x.h> #include <mpc824x.h>
#include <pci.h> #include <pci.h>
#include <netdev.h>
#include "pn62.h" #include "pn62.h"
...@@ -186,3 +187,8 @@ static int get_mac_address (int id, u8 * mac, char *string, int size) ...@@ -186,3 +187,8 @@ static int get_mac_address (int id, u8 * mac, char *string, int size)
mac[0], mac[1], mac[2], mac[0], mac[1], mac[2],
mac[3], mac[4], mac[5]); mac[3], mac[4], mac[5]);
} }
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <asm/ic/sc520.h> #include <asm/ic/sc520.h>
#include <asm/ic/ali512x.h> #include <asm/ic/ali512x.h>
#include <spi.h> #include <spi.h>
#include <netdev.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
...@@ -629,3 +630,8 @@ ssize_t spi_write(uchar *addr, int alen, uchar *buffer, int len) ...@@ -629,3 +630,8 @@ ssize_t spi_write(uchar *addr, int alen, uchar *buffer, int len)
#endif #endif
return res; return res;
} }
int board_eth_init(bd_t *bis)
{
return pci_eth_init(bis);
}
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,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>
......
...@@ -48,6 +48,7 @@ int mcdmafec_initialize(bd_t *bis); ...@@ -48,6 +48,7 @@ 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 natsemi_initialize(bd_t *bis);
int ns8382x_initialize(bd_t *bis); int ns8382x_initialize(bd_t *bis);
int pcnet_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 skge_initialize(bd_t *bis); int skge_initialize(bd_t *bis);
...@@ -61,6 +62,10 @@ int uli526x_initialize(bd_t *bis); ...@@ -61,6 +62,10 @@ 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_PCNET
num += pcnet_initialize(bis);
#endif
#ifdef CONFIG_NATSEMI #ifdef CONFIG_NATSEMI
num += natsemi_initialize(bis); num += natsemi_initialize(bis);
#endif #endif
......
...@@ -55,7 +55,6 @@ extern int mpc512x_fec_initialize(bd_t*); ...@@ -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 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 *);
extern int scc_initialize(bd_t*); extern int scc_initialize(bd_t*);
...@@ -227,9 +226,6 @@ int eth_initialize(bd_t *bis) ...@@ -227,9 +226,6 @@ int eth_initialize(bd_t *bis)
#ifdef CONFIG_3COM #ifdef CONFIG_3COM
eth_3com_initialize(bis); eth_3com_initialize(bis);
#endif #endif
#ifdef CONFIG_PCNET
pcnet_initialize(bis);
#endif
#ifdef CFG_GT_6426x #ifdef CFG_GT_6426x
gt6426x_eth_initialize(bis); gt6426x_eth_initialize(bis);
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment