summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2007-12-27 02:01:15 +0100
committerWolfgang Denk <wd@denx.de>2007-12-27 02:01:15 +0100
commit0dcfe3a225a9436fc514f374a19242c672f1172b (patch)
tree7ac3f382538d8919e475c6eaed25abb1af71e005 /cpu
parent61fb15c516fef5631e305f1976d7b3a679725856 (diff)
parent33ed73bc0e38d0f2b5c183d4629d8f207e5b9994 (diff)
downloadu-boot-imx-0dcfe3a225a9436fc514f374a19242c672f1172b.zip
u-boot-imx-0dcfe3a225a9436fc514f374a19242c672f1172b.tar.gz
u-boot-imx-0dcfe3a225a9436fc514f374a19242c672f1172b.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'cpu')
-rw-r--r--cpu/mpc8xx/speed.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/cpu/mpc8xx/speed.c b/cpu/mpc8xx/speed.c
index 101d5f9..11b0893 100644
--- a/cpu/mpc8xx/speed.c
+++ b/cpu/mpc8xx/speed.c
@@ -259,11 +259,8 @@ int get_clocks_866 (void)
*/
sccr_reg = immr->im_clkrst.car_sccr;
sccr_reg &= ~SCCR_EBDF11;
-#if defined(CONFIG_TQM885D)
- if (gd->cpu_clk <= 80000000) {
-#else
+
if (gd->cpu_clk <= 66000000) {
-#endif
sccr_reg |= SCCR_EBDF00; /* bus division factor = 1 */
gd->bus_clk = gd->cpu_clk;
} else {