Moved initialization of IXP4XX_NPE Ethernet controller to cpu_eth_init()

Also, removed the driver initialization from net/eth.c

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

diff --git a/cpu/ixp/cpu.c b/cpu/ixp/cpu.c
index 402188e30822fcaee9b6ae7b597d1ca2e312a3a6..27872fb78473bb63fde2b21cad04e889a44b6502 100644 (file)
--- a/cpu/ixp/cpu.c
+++ b/cpu/ixp/cpu.c
@@ -32,6 +32,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <netdev.h>
 #include <asm/arch/ixp425.h>
 
 ulong loops_per_jiffy;
@@ -215,3 +216,11 @@ ulong bootcount_load (void)
 }
 
 #endif /* CONFIG_BOOTCOUNT_LIMIT */
+
+int cpu_eth_init(bd_t *bis)
+{
+#ifdef CONFIG_IXP4XX_NPE
+       npe_initialize(bis);
+#endif
+       return 0;
+}

diff --git a/include/netdev.h b/include/netdev.h
index 87d578c2719269a570d7441b59b712d3779ec282..3739980114c066ae30977b0c6eee833df8d8e7d9 100644 (file)
--- a/include/netdev.h
+++ b/include/netdev.h
@@ -55,6 +55,7 @@ int mcffec_initialize(bd_t *bis);
 int mpc512x_fec_initialize(bd_t *bis);
 int mpc5xxx_fec_initialize(bd_t *bis);
 int natsemi_initialize(bd_t *bis);
+int npe_initialize(bd_t *bis);
 int ns8382x_initialize(bd_t *bis);
 int pcnet_initialize(bd_t *bis);
 int plb2800_eth_initialize(bd_t *bis);

diff --git a/net/eth.c b/net/eth.c
index ccd871a67c320daec528345c36fa6471570ef5c0..cad8fe3352efb0c2ca8c593ebd836d0e98e9669d 100644 (file)
--- a/net/eth.c
+++ b/net/eth.c
@@ -46,7 +46,6 @@ extern int mv6436x_eth_initialize(bd_t *);
 extern int mv6446x_eth_initialize(bd_t *);
 extern int ppc_4xx_eth_initialize(bd_t *);
 extern int scc_initialize(bd_t*);
-extern int npe_initialize(bd_t *);
 extern int uec_initialize(int);
 
 #ifdef CONFIG_API
@@ -192,9 +191,6 @@ int eth_initialize(bd_t *bis)
 #endif
 #if defined(CONFIG_AU1X00)
        au1x00_enet_initialize(bis);
-#endif
-#if defined(CONFIG_IXP4XX_NPE)
-       npe_initialize(bis);
 #endif
        if (!eth_devices) {
                puts ("No ethernet found.\n");