Commit cc94074e authored by Ben Warren's avatar Ben Warren

Moved initialization of IXP4XX_NPE Ethernet controller to cpu_eth_init()

Also, removed the driver initialization from net/eth.c
Signed-off-by: default avatarBen Warren <biggerbadderben@gmail.com>
parent f2a7806f
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <netdev.h>
#include <asm/arch/ixp425.h> #include <asm/arch/ixp425.h>
ulong loops_per_jiffy; ulong loops_per_jiffy;
...@@ -215,3 +216,11 @@ ulong bootcount_load (void) ...@@ -215,3 +216,11 @@ ulong bootcount_load (void)
} }
#endif /* CONFIG_BOOTCOUNT_LIMIT */ #endif /* CONFIG_BOOTCOUNT_LIMIT */
int cpu_eth_init(bd_t *bis)
{
#ifdef CONFIG_IXP4XX_NPE
npe_initialize(bis);
#endif
return 0;
}
...@@ -55,6 +55,7 @@ int mcffec_initialize(bd_t *bis); ...@@ -55,6 +55,7 @@ int mcffec_initialize(bd_t *bis);
int mpc512x_fec_initialize(bd_t *bis); int mpc512x_fec_initialize(bd_t *bis);
int mpc5xxx_fec_initialize(bd_t *bis); int mpc5xxx_fec_initialize(bd_t *bis);
int natsemi_initialize(bd_t *bis); int natsemi_initialize(bd_t *bis);
int npe_initialize(bd_t *bis);
int ns8382x_initialize(bd_t *bis); int ns8382x_initialize(bd_t *bis);
int pcnet_initialize(bd_t *bis); int pcnet_initialize(bd_t *bis);
int plb2800_eth_initialize(bd_t *bis); int plb2800_eth_initialize(bd_t *bis);
......
...@@ -46,7 +46,6 @@ extern int mv6436x_eth_initialize(bd_t *); ...@@ -46,7 +46,6 @@ extern int mv6436x_eth_initialize(bd_t *);
extern int mv6446x_eth_initialize(bd_t *); extern int mv6446x_eth_initialize(bd_t *);
extern int ppc_4xx_eth_initialize(bd_t *); extern int ppc_4xx_eth_initialize(bd_t *);
extern int scc_initialize(bd_t*); extern int scc_initialize(bd_t*);
extern int npe_initialize(bd_t *);
extern int uec_initialize(int); extern int uec_initialize(int);
#ifdef CONFIG_API #ifdef CONFIG_API
...@@ -192,9 +191,6 @@ int eth_initialize(bd_t *bis) ...@@ -192,9 +191,6 @@ int eth_initialize(bd_t *bis)
#endif #endif
#if defined(CONFIG_AU1X00) #if defined(CONFIG_AU1X00)
au1x00_enet_initialize(bis); au1x00_enet_initialize(bis);
#endif
#if defined(CONFIG_IXP4XX_NPE)
npe_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