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: Ben Warren <biggerbadderben@gmail.com>

diff --git a/board/pn62/pn62.c b/board/pn62/pn62.c
index d905b2965cc7fa0a23ccd52090664ca43e564563..60fc431db5f2a41ea4efac8ef59894af08b91662 100644 (file)
--- a/board/pn62/pn62.c
+++ b/board/pn62/pn62.c
@@ -23,6 +23,7 @@
 #include <common.h>
 #include <mpc824x.h>
 #include <pci.h>
+#include <netdev.h>
 
 #include "pn62.h"
 
@@ -186,3 +187,8 @@ static int get_mac_address (int id, u8 * mac, char *string, int size)
                                mac[0], mac[1], mac[2],
                                mac[3], mac[4], mac[5]);
 }
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}

diff --git a/board/sc520_cdp/sc520_cdp.c b/board/sc520_cdp/sc520_cdp.c
index 8050aa6fee6c297be11bd91ae620ecc7cbb30e63..f21c73002fc9d621d97bdd87061fb17a8346d0fa 100644 (file)
--- a/board/sc520_cdp/sc520_cdp.c
+++ b/board/sc520_cdp/sc520_cdp.c
@@ -29,6 +29,7 @@
 #include <asm/ic/sc520.h>
 #include <asm/ic/ali512x.h>
 #include <spi.h>
+#include <netdev.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
@@ -629,3 +630,8 @@ ssize_t spi_write(uchar *addr, int alen, uchar *buffer, int len)
 #endif
        return res;
 }
+
+int board_eth_init(bd_t *bis)
+{
+       return pci_eth_init(bis);
+}

diff --git a/drivers/net/pcnet.c b/drivers/net/pcnet.c
index a4f02141063621588bd4ca837b5e7e36563091c6..99b69429e9da4721b313f8a8714afa587893f801 100644 (file)
--- a/drivers/net/pcnet.c
+++ b/drivers/net/pcnet.c
@@ -26,6 +26,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <net.h>
+#include <netdev.h>
 #include <asm/io.h>
 #include <pci.h>
 

diff --git a/include/netdev.h b/include/netdev.h
index c5b0815e04c2c0577eae258a1301ddbf113bcaa7..b1dadd84b3b5201f5be2f05a7997a3fd76eadf1c 100644 (file)
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -48,6 +48,7 @@ int mcdmafec_initialize(bd_t *bis);
 int mcffec_initialize(bd_t *bis);
 int natsemi_initialize(bd_t *bis);
 int ns8382x_initialize(bd_t *bis);
+int pcnet_initialize(bd_t *bis);
 int rtl8139_initialize(bd_t *bis);
 int rtl8169_initialize(bd_t *bis);
 int skge_initialize(bd_t *bis);
@@ -61,6 +62,10 @@ int uli526x_initialize(bd_t *bis);
 static inline int pci_eth_init(bd_t *bis)
 {
        int num = 0;
+
+#ifdef CONFIG_PCNET
+       num += pcnet_initialize(bis);
+#endif
 #ifdef CONFIG_NATSEMI
        num += natsemi_initialize(bis);
 #endif

diff --git a/net/eth.c b/net/eth.c
index dc7b288a662492274b884812ad38a71ad614e45d..aa6b2c8c2a47ba13641bb826d3b99998e519a1e6 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -55,7 +55,6 @@ extern int mpc512x_fec_initialize(bd_t*);
 extern int mpc8220_fec_initialize(bd_t*);
 extern int mv6436x_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 ppc_4xx_eth_initialize(bd_t *);
 extern int scc_initialize(bd_t*);
@@ -227,9 +226,6 @@ int eth_initialize(bd_t *bis)
 #ifdef CONFIG_3COM
        eth_3com_initialize(bis);
 #endif
-#ifdef CONFIG_PCNET
-       pcnet_initialize(bis);
-#endif
 #ifdef CFG_GT_6426x
        gt6426x_eth_initialize(bis);
 #endif