diff options
| author | Ben Warren <biggerbadderben@gmail.com> | 2008-08-26 22:16:25 -0700 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2008-08-26 22:16:25 -0700 |
| commit | 86882b80771309bceb11c6accfd7f6f90ade8bfc (patch) | |
| tree | 0004ca8c6e9c31b0ee46f0dd07f49e01711e75ef /cpu/mcf547x_8x | |
| parent | b31da88b9c160d80d42a59cbbb31e24f27184d5c (diff) | |
Moved initialization of MCFFEC Ethernet driver to CPU directory
Added a cpu_eth_init() function to coldfire CPU directories and
removed code from net/eth.c
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'cpu/mcf547x_8x')
| -rw-r--r-- | cpu/mcf547x_8x/cpu.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/cpu/mcf547x_8x/cpu.c b/cpu/mcf547x_8x/cpu.c index e29b45c4c..1ba7aa80a 100644 --- a/cpu/mcf547x_8x/cpu.c +++ b/cpu/mcf547x_8x/cpu.c @@ -142,11 +142,23 @@ int watchdog_init(void) } #endif /* CONFIG_HW_WATCHDOG */ -#if defined(CONFIG_FSLDMAFEC) +#if defined(CONFIG_FSLDMAFEC) || defined(CONFIG_MCFFEC) +/* Default initializations for MCFFEC controllers. To override, + * create a board-specific function called: + * int board_eth_init(bd_t *bis) + */ + extern int mcdmafec_initialize(bd_t *bis); +extern int mcffec_initialize(bd_t*); int cpu_eth_init(bd_t *bis) { - return mcdmafec_initialize(bis); +#if defined(CONFIG_FSLDMAFEC) + mcdmafec_initialize(bis); +#endif +#if defined(CONFIG_MCFFEC) + mcffec_initialize(bis); +#endif + return 0; } #endif |