From b31da88b9c160d80d42a59cbbb31e24f27184d5c Mon Sep 17 00:00:00 2001 From: Ben Warren Date: Tue, 26 Aug 2008 22:12:36 -0700 Subject: [PATCH] Moved initialization of FSL_MCDMAFEC Ethernet driver to CPU directory Added a cpu_eth_init() function to cpu/mcf547x_8x directory and removed code from net/eth.c Signed-off-by: Ben Warren --- cpu/mcf547x_8x/cpu.c | 9 +++++++++ drivers/net/fsl_mcdmafec.c | 2 +- net/eth.c | 4 ---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cpu/mcf547x_8x/cpu.c b/cpu/mcf547x_8x/cpu.c index 528bca6bf9..e29b45c4cc 100644 --- a/cpu/mcf547x_8x/cpu.c +++ b/cpu/mcf547x_8x/cpu.c @@ -141,3 +141,12 @@ int watchdog_init(void) return (0); } #endif /* CONFIG_HW_WATCHDOG */ + +#if defined(CONFIG_FSLDMAFEC) +extern int mcdmafec_initialize(bd_t *bis); + +int cpu_eth_init(bd_t *bis) +{ + return mcdmafec_initialize(bis); +} +#endif diff --git a/drivers/net/fsl_mcdmafec.c b/drivers/net/fsl_mcdmafec.c index f2bdba6184..e34975a12f 100644 --- a/drivers/net/fsl_mcdmafec.c +++ b/drivers/net/fsl_mcdmafec.c @@ -582,5 +582,5 @@ int mcdmafec_initialize(bd_t * bis) /* default speed */ bis->bi_ethspeed = 10; - return 1; + return 0; } diff --git a/net/eth.c b/net/eth.c index 8e83b66c0a..bc57ca3e89 100644 --- a/net/eth.c +++ b/net/eth.c @@ -71,7 +71,6 @@ extern int uec_initialize(int); extern int bfin_EMAC_initialize(bd_t *); extern int greth_initialize(bd_t *); extern int mcffec_initialize(bd_t*); -extern int mcdmafec_initialize(bd_t*); extern int at91sam9_eth_initialize(bd_t *); #ifdef CONFIG_API @@ -275,9 +274,6 @@ int eth_initialize(bd_t *bis) #if defined(CONFIG_MCFFEC) mcffec_initialize(bis); #endif -#if defined(CONFIG_FSLDMAFEC) - mcdmafec_initialize(bis); -#endif #if defined(CONFIG_AT91CAP9) || defined(CONFIG_AT91SAM9260) || \ defined(CONFIG_AT91SAM9263) at91sam9_eth_initialize(bis); -- 2.25.1