diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-07-06 01:15:17 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-07-06 01:15:17 +0200 |
| commit | d86a0a6f7fe433787edf06aecba9fd6abfecab48 (patch) | |
| tree | 005ba8a000e7bdcab42c1df6339bf7e51dcda2ca /cpu/mpc8260/cpu.c | |
| parent | a524e112b424c6843800ea2f19d3a8cf01d0aa94 (diff) | |
| parent | f492dd636fbbae529e17533995bc6e5813c007f6 (diff) | |
Merge branch 'master' of ssh+git://mercury.denx.de/home/wd/git/u-boot/master
Conflicts:
board/amirix/ap1000/serial.c
board/exbitgen/exbitgen.c
board/exbitgen/flash.c
board/ml2/serial.c
board/xilinx/ml300/serial.c
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'cpu/mpc8260/cpu.c')
| -rw-r--r-- | cpu/mpc8260/cpu.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c index 414759e74c..4d5d141ea2 100644 --- a/cpu/mpc8260/cpu.c +++ b/cpu/mpc8260/cpu.c @@ -305,6 +305,11 @@ void ft_cpu_setup (void *blob, bd_t *bd) { char * cpu_path = "/cpus/" OF_CPU; +#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\ + defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) + fdt_fixup_ethernet(blob, bd); +#endif + do_fixup_by_path_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1); do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1); do_fixup_by_path_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1); |