diff options
author | Wolfgang Denk <wd@denx.de> | 2008-04-29 20:06:42 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-04-29 20:06:42 +0200 |
commit | 84666476841cef3ef6df5c5a2a110d43b0936999 (patch) | |
tree | 7db6eed156c8b285651f00155f7dd8407a7ab49d /cpu/ppc4xx/fdt.c | |
parent | 3a427fd2ec3d980875a25327955c34a2de0b494c (diff) | |
parent | f4c4d21a885ccc222fd0acdf653b683249e85117 (diff) | |
download | u-boot-imx-84666476841cef3ef6df5c5a2a110d43b0936999.zip u-boot-imx-84666476841cef3ef6df5c5a2a110d43b0936999.tar.gz u-boot-imx-84666476841cef3ef6df5c5a2a110d43b0936999.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'cpu/ppc4xx/fdt.c')
-rw-r--r-- | cpu/ppc4xx/fdt.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/cpu/ppc4xx/fdt.c b/cpu/ppc4xx/fdt.c index 1f4d6f2..02dece0 100644 --- a/cpu/ppc4xx/fdt.c +++ b/cpu/ppc4xx/fdt.c @@ -83,8 +83,14 @@ void ft_cpu_setup(void *blob, bd_t *bd) bd->bi_intfreq, 1); do_fixup_by_path_u32(blob, "/plb", "clock-frequency", sys_info.freqPLB, 1); do_fixup_by_path_u32(blob, "/plb/opb", "clock-frequency", sys_info.freqOPB, 1); - do_fixup_by_path_u32(blob, "/plb/opb/ebc", "clock-frequency", - sys_info.freqEBC, 1); + + if (fdt_path_offset(blob, "/plb/opb/ebc") >= 0) + do_fixup_by_path_u32(blob, "/plb/opb/ebc", "clock-frequency", + sys_info.freqEBC, 1); + else + do_fixup_by_path_u32(blob, "/plb/ebc", "clock-frequency", + sys_info.freqEBC, 1); + fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); /* |