summaryrefslogtreecommitdiff
path: root/cpu/ppc4xx/cpu.c
diff options
context:
space:
mode:
authorMichael Brandt <Michael.Brandt@stericsson.com>2009-10-26 10:23:13 +0100
committerMichael Brandt <Michael.Brandt@stericsson.com>2009-10-26 10:23:13 +0100
commitdd037f7a4f779bdfa9984b0db74a1bcdf7170fe9 (patch)
treeca7e06ab2c6ebd83269d24542b0881e622f314da /cpu/ppc4xx/cpu.c
parent4bd4413ae52e40d8e4c4e801b8d6bc3daf3229e3 (diff)
parentf3ee25859e3920ee7c7cc519a3e6f60d70d7a53f (diff)
Merge branch 'master' of http://git.denx.de/u-boot
Conflicts: Makefile
Diffstat (limited to 'cpu/ppc4xx/cpu.c')
-rw-r--r--cpu/ppc4xx/cpu.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c
index a9a0ac345..e1b00a74c 100644
--- a/cpu/ppc4xx/cpu.c
+++ b/cpu/ppc4xx/cpu.c
@@ -608,10 +608,17 @@ int checkcpu (void)
break;
}
- printf (" at %s MHz (PLB=%lu, OPB=%lu, EBC=%lu MHz)\n", strmhz(buf, clock),
+ printf (" at %s MHz (PLB=%lu OPB=%lu EBC=%lu",
+ strmhz(buf, clock),
sys_info.freqPLB / 1000000,
get_OPB_freq() / 1000000,
sys_info.freqEBC / 1000000);
+#if defined(CONFIG_PCI) && \
+ (defined(CONFIG_440EP) || defined(CONFIG_440EPX) || \
+ defined(CONFIG_440GR) || defined(CONFIG_440GRX))
+ printf(" PCI=%lu MHz", sys_info.freqPCI / 1000000);
+#endif
+ printf(")\n");
if (addstr[0] != 0)
printf(" %s\n", addstr);