diff options
| author | Ben Warren <biggerbadderben@gmail.com> | 2008-09-05 01:55:22 -0400 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2008-11-09 21:38:02 -0800 |
| commit | cc94074ecac1885d18ddb683eb934b3c0268aa5b (patch) | |
| tree | c0a836f88c95358e0154702b7037b7a11df4b29e | |
| parent | f2a7806fc23e82d30c8548911369e0c530607354 (diff) | |
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>
| -rw-r--r-- | cpu/ixp/cpu.c | 9 | ||||
| -rw-r--r-- | include/netdev.h | 1 | ||||
| -rw-r--r-- | net/eth.c | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/cpu/ixp/cpu.c b/cpu/ixp/cpu.c index 402188e30..27872fb78 100644 --- 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 87d578c27..373998011 100644 --- 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); @@ -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 @@ -193,9 +192,6 @@ int eth_initialize(bd_t *bis) #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"); show_boot_progress (-64); |