Commit 164846ee authored by Ben Warren's avatar Ben Warren

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: default avatarBen Warren <biggerbadderben@gmail.com>
parent 6aca145e
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <pci.h> #include <pci.h>
#include <netdev.h>
#include "articiaS.h" #include "articiaS.h"
#include "memio.h" #include "memio.h"
#include "via686.h" #include "via686.h"
...@@ -111,3 +112,11 @@ void pci_init_board (void) ...@@ -111,3 +112,11 @@ void pci_init_board (void)
articiaS_pci_init (); articiaS_pci_init ();
#endif #endif
} }
int board_eth_init(bd_t *bis)
{
#if defined(CONFIG_3COM)
eth_3com_initialize(bis);
#endif
return 0;
}
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,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>
......
...@@ -42,6 +42,7 @@ int cpu_eth_init(bd_t *bis); ...@@ -42,6 +42,7 @@ int cpu_eth_init(bd_t *bis);
/* Driver initialization prototypes */ /* Driver initialization prototypes */
int bfin_EMAC_initialize(bd_t *bis); int bfin_EMAC_initialize(bd_t *bis);
int eth_3com_initialize (bd_t * bis);
int greth_initialize(bd_t *bis); int greth_initialize(bd_t *bis);
void gt6426x_eth_initialize(bd_t *bis); void gt6426x_eth_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);
......
...@@ -43,7 +43,6 @@ extern int au1x00_enet_initialize(bd_t*); ...@@ -43,7 +43,6 @@ extern int au1x00_enet_initialize(bd_t*);
extern int dc21x4x_initialize(bd_t*); extern int dc21x4x_initialize(bd_t*);
extern int e1000_initialize(bd_t*); extern int e1000_initialize(bd_t*);
extern int eepro100_initialize(bd_t*); extern int eepro100_initialize(bd_t*);
extern int eth_3com_initialize(bd_t*);
extern int fec_initialize(bd_t*); extern int fec_initialize(bd_t*);
extern int inca_switch_initialize(bd_t*); extern int inca_switch_initialize(bd_t*);
extern int mpc5xxx_fec_initialize(bd_t*); extern int mpc5xxx_fec_initialize(bd_t*);
...@@ -218,9 +217,6 @@ int eth_initialize(bd_t *bis) ...@@ -218,9 +217,6 @@ int eth_initialize(bd_t *bis)
#endif #endif
#ifdef CONFIG_TULIP #ifdef CONFIG_TULIP
dc21x4x_initialize(bis); dc21x4x_initialize(bis);
#endif
#ifdef CONFIG_3COM
eth_3com_initialize(bis);
#endif #endif
if (!eth_devices) { if (!eth_devices) {
puts ("No ethernet found.\n"); puts ("No ethernet found.\n");
......
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