[U-Boot] [PATCH 07/17] Moved initialization of NATSEMI Ethernet controller to board_eth_init()
Ben Warren
biggerbadderben at gmail.com
Sun Aug 31 10:46:41 CEST 2008
Affected boards:
a3000
Removed initialization of the driver from net/eth.c
Signed-off-by: Ben Warren <biggerbadderben at gmail.com>
---
board/a3000/a3000.c | 7 +++++++
include/netdev.h | 4 ++++
net/eth.c | 4 ----
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/board/a3000/a3000.c b/board/a3000/a3000.c
index c1eceaa..040ba89 100644
--- a/board/a3000/a3000.c
+++ b/board/a3000/a3000.c
@@ -27,6 +27,7 @@
#include <common.h>
#include <mpc824x.h>
#include <pci.h>
+#include <netdev.h>
int checkboard (void)
{
@@ -109,3 +110,9 @@ void pci_init_board(void)
{
pci_mpc824x_init(&hose);
}
+
+int board_eth_init(bd_t *bis)
+{
+ return pci_eth_init(bis);
+}
+
diff --git a/include/netdev.h b/include/netdev.h
index c8f4413..3a51ae4 100644
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -46,6 +46,7 @@ int greth_initialize(bd_t *bis);
int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
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 rtl8139_initialize(bd_t *bis);
int rtl8169_initialize(bd_t *bis);
@@ -61,6 +62,9 @@ int uli526x_initialize(bd_t *bis);
static int pci_eth_init(bd_t *bis)
{
int num = 0;
+#ifdef CONFIG_NATSEMI
+ num += natsemi_initialize(bis);
+#endif
#ifdef CONFIG_NS8382X
num += ns8382x_initialize(bis);
#endif
diff --git a/net/eth.c b/net/eth.c
index 9747138..65dd888 100644
--- 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 natsemi_initialize(bd_t*);
extern int pcnet_initialize(bd_t*);
extern int plb2800_eth_initialize(bd_t*);
extern int ppc_4xx_eth_initialize(bd_t *);
@@ -234,9 +233,6 @@ int eth_initialize(bd_t *bis)
#ifdef CFG_GT_6426x
gt6426x_eth_initialize(bis);
#endif
-#ifdef CONFIG_NATSEMI
- natsemi_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