Moved initialization of plb2800 Ethernet driver to board_eth_init

Affected boards:
	purple

Removed initialization of controller from net/eth.c

Signed-off-by: Ben Warren <biggerbadderben@gmail.com>

diff --git a/board/purple/purple.c b/board/purple/purple.c
index 97755911297608976c8b862ebecedfd0bdbfbdc1..c129d7a109ece7667e056269122ff44ff83a01ae 100644 (file)
--- a/board/purple/purple.c
+++ b/board/purple/purple.c
@@ -23,6 +23,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <netdev.h>
 #include <asm/inca-ip.h>
 #include <asm/regdef.h>
 #include <asm/mipsregs.h>
@@ -274,3 +275,11 @@ void copy_code (ulong dest_addr)
                start += CFG_CACHELINE_SIZE;
        }
 }
+
+#ifdef CONFIG_PLB2800_ETHER
+int board_eth_init(bd_t *bis)
+{
+       return plb2800_eth_initialize(bis);
+}
+#endif
+

diff --git a/drivers/net/plb2800_eth.c b/drivers/net/plb2800_eth.c
index dad842c728dc03075e03fbe2ddd7231ced4b108f..d799c738234737969b3e0847e765eec5e03043b6 100644 (file)
--- a/drivers/net/plb2800_eth.c
+++ b/drivers/net/plb2800_eth.c
@@ -26,6 +26,7 @@
 #include <common.h>
 #include <malloc.h>
 #include <net.h>
+#include <netdev.h>
 #include <asm/addrspace.h>
 
 
@@ -105,7 +106,7 @@ int plb2800_eth_initialize(bd_t * bis)
        if (!(dev = (struct eth_device *) malloc (sizeof *dev)))
        {
                printf("Failed to allocate memory\n");
-               return 0;
+               return -1;
        }
        memset(dev, 0, sizeof(*dev));
 
@@ -140,7 +141,7 @@ int plb2800_eth_initialize(bd_t * bis)
        printf("Leaving plb2800_eth_initialize()\n");
 #endif
 
-       return 1;
+       return 0;
 }
 
 static int plb2800_eth_init(struct eth_device *dev, bd_t * bis)

diff --git a/include/netdev.h b/include/netdev.h
index f7738cc4631b73999fdfea1d29af151552bfc520..1013a803abd292cc28dccf24da3d85bc9bc13ead 100644 (file)
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -54,6 +54,7 @@ int mpc5xxx_fec_initialize(bd_t *bis);
 int natsemi_initialize(bd_t *bis);
 int ns8382x_initialize(bd_t *bis);
 int pcnet_initialize(bd_t *bis);
+int plb2800_eth_initialize(bd_t *bis);
 int rtl8139_initialize(bd_t *bis);
 int rtl8169_initialize(bd_t *bis);
 int skge_initialize(bd_t *bis);

diff --git a/net/eth.c b/net/eth.c
index 053179e4314bdb9f9f1f222924a84af508ed9dc2..42c370b7dfb56b62d297c8e2dd9f966d8af08486 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -47,7 +47,6 @@ extern int 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 plb2800_eth_initialize(bd_t*);
 extern int ppc_4xx_eth_initialize(bd_t *);
 extern int scc_initialize(bd_t*);
 extern int npe_initialize(bd_t *);
@@ -166,9 +165,6 @@ int eth_initialize(bd_t *bis)
 #if defined(CONFIG_4xx) && !defined(CONFIG_IOP480) && !defined(CONFIG_AP1000)
        ppc_4xx_eth_initialize(bis);
 #endif
-#ifdef CONFIG_PLB2800_ETHER
-       plb2800_eth_initialize(bis);
-#endif
 #ifdef SCC_ENET
        scc_initialize(bis);
 #endif