summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@pollux.denx.de>2005-08-12 22:32:29 +0200
committerWolfgang Denk <wd@pollux.denx.de>2005-08-12 22:32:29 +0200
commit4d302d69c83f7a09239c6575bc6cd37f1a4c77ae (patch)
treecd3160a78fbfb9d5c686813f41f3ca9bf3a55ff6
parent8534bf9ac0c4c37ff684c03189a564f0aae7b076 (diff)
downloadu-boot-imx-4d302d69c83f7a09239c6575bc6cd37f1a4c77ae.zip
u-boot-imx-4d302d69c83f7a09239c6575bc6cd37f1a4c77ae.tar.gz
u-boot-imx-4d302d69c83f7a09239c6575bc6cd37f1a4c77ae.tar.bz2
measure_gclk() is needed when DEBUG is enabled
Patch by Bryan O'Donoghue, 25 Apr 2005
-rw-r--r--CHANGELOG3
-rw-r--r--cpu/mpc8xx/speed.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 1325ffe..a8db4a8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
Changes for U-Boot 1.1.3:
======================================================================
+* measure_gclk() is needed when DEBUG is enabled
+ Patch by Bryan O'Donoghue, 25 Apr 2005
+
* Add UPD-Checksum code, fix problem in net.c (return instead of break)
Patch by Reinhard Arlt, 12 Aug 2005
diff --git a/cpu/mpc8xx/speed.c b/cpu/mpc8xx/speed.c
index 95003ed..f038316 100644
--- a/cpu/mpc8xx/speed.c
+++ b/cpu/mpc8xx/speed.c
@@ -25,7 +25,7 @@
#include <mpc8xx.h>
#include <asm/processor.h>
-#if !defined(CONFIG_8xx_CPUCLK_DEFAULT) || defined(CFG_MEASURE_CPUCLK)
+#if !defined(CONFIG_8xx_CPUCLK_DEFAULT) || defined(CFG_MEASURE_CPUCLK) || defined(DEBUG)
#define PITC_SHIFT 16
#define PITR_SHIFT 16