[U-Boot] [PATCH 10/17] Moved initialization of 3COM Ethernet controller (AmigaOne) to board_eth_init()
Ben Warren
biggerbadderben at gmail.com
Sun Aug 31 10:46:44 CEST 2008
Affected boards:
AmigaOneG3SE
Removed initialization of the driver from net/eth.c
Signed-off-by: Ben Warren <biggerbadderben at gmail.com>
---
board/MAI/AmigaOneG3SE/AmigaOneG3SE.c | 9 +++++++++
include/netdev.h | 1 +
net/eth.c | 4 ----
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c b/board/MAI/AmigaOneG3SE/AmigaOneG3SE.c
index e118563..4d44001 100644
--- 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/include/netdev.h b/include/netdev.h
index 454a9a4..bea9fac 100644
--- 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);
int 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 5a3d0e8..bedb4ff 100644
--- 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*);
@@ -219,9 +218,6 @@ int eth_initialize(bd_t *bis)
#ifdef CONFIG_TULIP
dc21x4x_initialize(bis);
#endif
-#ifdef CONFIG_3COM
- eth_3com_initialize(bis);
-#endif
if (!eth_devices) {
puts ("No ethernet found.\n");
show_boot_progress (-64);
--
1.5.4.3
More information about the U-Boot
mailing list