Moved initialization of 3COM Ethernet controller (AmigaOne) to board_eth_init()

    Affected boards:
        AmigaOneG3SE

    Removed initialization of the driver from net/eth.c

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

diff --git a/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c b/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
index e118563fc42c37ec2e4692ff8f7672197a56bf2c..4d44001ffa412209d9b43466fad6d2f87afe2528 100644 (file)
--- a/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
+++ b/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
@@ -26,6 +26,7 @@
 #include <common.h>
 #include <command.h>
 #include <pci.h>
+#include <netdev.h>
 #include "articiaS.h"
 #include "memio.h"
 #include "via686.h"
@@ -111,3 +112,11 @@ void pci_init_board (void)
        articiaS_pci_init ();
 #endif
 }
+
+int board_eth_init(bd_t *bis)
+{
+#if defined(CONFIG_3COM)
+       eth_3com_initialize(bis);
+#endif
+       return 0;
+}

diff --git a/board/MAI/AmigaOneG3SE/enet.c b/board/MAI/AmigaOneG3SE/enet.c
index 5a90cc57dde4740b08910023299fe44df8e66afb..0b4dfe6aa36485c590c3ef3b4f5468273ed90cd1 100644 (file)
--- a/board/MAI/AmigaOneG3SE/enet.c
+++ b/board/MAI/AmigaOneG3SE/enet.c
@@ -28,6 +28,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 666d12d3890ef98bc53da2e13e28a226721c6a13..0c16dd612cdb9e3b440283f3b056fb6872b37175 100644 (file)
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -42,6 +42,7 @@ int cpu_eth_init(bd_t *bis);
 
 /* Driver initialization prototypes */
 int bfin_EMAC_initialize(bd_t *bis);
+int eth_3com_initialize (bd_t * bis);
 int greth_initialize(bd_t *bis);
 void gt6426x_eth_initialize(bd_t *bis);
 int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);

diff --git a/net/eth.c b/net/eth.c
index 99efa164c293822c375fd442da4bd2b09290e76e..c4d7b63d9c2a843fefe39f082c59fff9b2819c0d 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -43,7 +43,6 @@ extern int au1x00_enet_initialize(bd_t*);
 extern int dc21x4x_initialize(bd_t*);
 extern int e1000_initialize(bd_t*);
 extern int eepro100_initialize(bd_t*);
-extern int eth_3com_initialize(bd_t*);
 extern int fec_initialize(bd_t*);
 extern int inca_switch_initialize(bd_t*);
 extern int mpc5xxx_fec_initialize(bd_t*);
@@ -218,9 +217,6 @@ int eth_initialize(bd_t *bis)
 #endif
 #ifdef CONFIG_TULIP
        dc21x4x_initialize(bis);
-#endif
-#ifdef CONFIG_3COM
-       eth_3com_initialize(bis);
 #endif
        if (!eth_devices) {
                puts ("No ethernet found.\n");