summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
authorJean-Philippe SAVE2012-08-20 11:14:09 +0200
committerCyril Jourdan2012-09-20 11:21:11 +0200
commita52882a58541cbf55d06a493a7458f92abe8c692 (patch)
tree19a19efc0a225ed5de9a08b8467cbf7fb2c8ad98 /cleopatre
parent20f6610c2e10fea351b2042a9a88f2d21085017c (diff)
cleo/u-boot/cpu/spc300: add timer clock for MSE500, refs #2961
- With a Xclk at 24MHz we cannot reach a timer_clk at 3,125MHz, so for MSE500 the timer_clk will be 4MHz.
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/u-boot-1.1.6/cpu/spc300/start.S3
-rw-r--r--cleopatre/u-boot-1.1.6/include/configs/mse500.h3
-rw-r--r--cleopatre/u-boot-1.1.6/include/configs/mse500dini_300.h3
-rw-r--r--cleopatre/u-boot-1.1.6/include/configs/sdk300.h3
-rw-r--r--cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h10
5 files changed, 12 insertions, 10 deletions
diff --git a/cleopatre/u-boot-1.1.6/cpu/spc300/start.S b/cleopatre/u-boot-1.1.6/cpu/spc300/start.S
index a925671a9f..d23b950f61 100644
--- a/cleopatre/u-boot-1.1.6/cpu/spc300/start.S
+++ b/cleopatre/u-boot-1.1.6/cpu/spc300/start.S
@@ -497,6 +497,9 @@ timer_clock_config:
moveq r2, #3 /* yes: timer_clk = xclk/(2*(3+1)) = 3.125MHz */
cmp r1, #NVRAM_XCLK_375 /* xclk = 37,5MHz ? */
moveq r2, #5 /* yes: timer_clk = xclk/(2*(5+1)) = 3.125MHz */
+ /* If we are a MSE500 xclk=24MHz and we want timer_clk = xclk/(2*(2+1)) = 4MHz */
+ cmp r1, #NVRAM_XCLK_MSE500
+ moveq r2, #2
/* store prescaler */
ldr r0, =MARIA_REGBANK_BASE
diff --git a/cleopatre/u-boot-1.1.6/include/configs/mse500.h b/cleopatre/u-boot-1.1.6/include/configs/mse500.h
index b63f3930f0..dc26d2460a 100644
--- a/cleopatre/u-boot-1.1.6/include/configs/mse500.h
+++ b/cleopatre/u-boot-1.1.6/include/configs/mse500.h
@@ -27,6 +27,9 @@
#include "spc300_arch.h"
+/* Timer clock in HZ */
+#define CFG_HZ (4000000)
+
/* SPI maximum frequency */
#define CFG_SPI_FREQ (30000000)
diff --git a/cleopatre/u-boot-1.1.6/include/configs/mse500dini_300.h b/cleopatre/u-boot-1.1.6/include/configs/mse500dini_300.h
index 8e198777ed..85df8939fa 100644
--- a/cleopatre/u-boot-1.1.6/include/configs/mse500dini_300.h
+++ b/cleopatre/u-boot-1.1.6/include/configs/mse500dini_300.h
@@ -27,6 +27,9 @@
#include "spc300_arch.h"
+/* Timer clock in HZ */
+#define CFG_HZ (3125000)
+
/* SPI maximum frequency */
#define CFG_SPI_FREQ (10000000)
diff --git a/cleopatre/u-boot-1.1.6/include/configs/sdk300.h b/cleopatre/u-boot-1.1.6/include/configs/sdk300.h
index 4055a2349c..22a8af1519 100644
--- a/cleopatre/u-boot-1.1.6/include/configs/sdk300.h
+++ b/cleopatre/u-boot-1.1.6/include/configs/sdk300.h
@@ -27,6 +27,9 @@
#include "spc300_arch.h"
+/* Timer clock in HZ */
+#define CFG_HZ (3125000)
+
/* SPI maximum frequency */
#define CFG_SPI_FREQ (20000000)
diff --git a/cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h b/cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h
index 9099e22b16..50d633cb40 100644
--- a/cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h
+++ b/cleopatre/u-boot-1.1.6/include/configs/spc300_arch.h
@@ -157,16 +157,6 @@
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>
-
-
-/*
- * CLOCK PARAMETERS
- */
-/* ((MARIA_TIMER_CLOCK==Xclk) max) / timer_prescaler */
-#define CFG_HZ (3125000) /* Timer clock in HZ */
-
-
-
/*
* UARTS PARAMETERS
*/