diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-09-03 23:07:41 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-09-03 23:07:41 +0200 |
| commit | 53c987f51391c1a221b0468aa0f37a3a6ce9181a (patch) | |
| tree | 62bd19ba9bcf8a5062e874ab53877b53a434d6f7 /cpu/mpc83xx | |
| parent | 1711f3bd16d1c5e9d17b4c0198b426d86999781b (diff) | |
| parent | ce42d166ac3c55ebf1e7c2f9707a79acefa006be (diff) | |
| download | u-boot-imx-53c987f51391c1a221b0468aa0f37a3a6ce9181a.zip u-boot-imx-53c987f51391c1a221b0468aa0f37a3a6ce9181a.tar.gz u-boot-imx-53c987f51391c1a221b0468aa0f37a3a6ce9181a.tar.bz2 | |
Merge branch 'master' of ssh://10.10.0.7/home/wd/git/u-boot/master
Diffstat (limited to 'cpu/mpc83xx')
| -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 52e4476..5862acd 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 |