diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-03 22:43:57 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-03 22:43:57 +0200 |
| commit | 16116ddd0d0158f4e91c91dc979b845b6e98a99d (patch) | |
| tree | e2062a888c76462b6335da29092c5fe4134c0859 /cpu/mpc83xx/cpu.c | |
| parent | 628ffd73bcff0c9f3bc5a8eeb2c7455fe9d28a51 (diff) | |
| parent | be1b0d2777e179191a57b138b660547a17e55aad (diff) | |
| download | olio-uboot-2014.01-16116ddd0d0158f4e91c91dc979b845b6e98a99d.tar.xz olio-uboot-2014.01-16116ddd0d0158f4e91c91dc979b845b6e98a99d.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-net
Diffstat (limited to 'cpu/mpc83xx/cpu.c')
| -rw-r--r-- | cpu/mpc83xx/cpu.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/cpu/mpc83xx/cpu.c b/cpu/mpc83xx/cpu.c index 52e4476d8..5862acdc4 100644 --- a/cpu/mpc83xx/cpu.c +++ b/cpu/mpc83xx/cpu.c @@ -32,6 +32,7 @@ #include <mpc83xx.h> #include <asm/processor.h> #include <libfdt.h> +#include <tsec.h> DECLARE_GLOBAL_DATA_PTR; @@ -358,22 +359,15 @@ int dma_xfer(void *dest, u32 count, void *src) } #endif /*CONFIG_DDR_ECC*/ -#ifdef CONFIG_TSEC_ENET -/* Default initializations for TSEC controllers. To override, - * create a board-specific function called: - * int board_eth_init(bd_t *bis) +/* + * Initializes on-chip ethernet controllers. + * to override, implement board_eth_init() */ - -extern int tsec_initialize(bd_t * bis, int index, char *devname); - int cpu_eth_init(bd_t *bis) { -#if defined(CONFIG_TSEC1) - tsec_initialize(bis, 0, CONFIG_TSEC1_NAME); -#endif -#if defined(CONFIG_TSEC2) - tsec_initialize(bis, 1, CONFIG_TSEC2_NAME); +#if defined(CONFIG_TSEC_ENET) + tsec_standard_init(bis); #endif + return 0; } -#endif |