summaryrefslogtreecommitdiff
path: root/cpu/mpc8260/speed.c
diff options
context:
space:
mode:
authorStefan Roese <sr@denx.de>2006-12-28 19:09:07 +0100
committerStefan Roese <sr@denx.de>2006-12-28 19:09:07 +0100
commitcce2adfb93ea31d21a2f69bbf68146dfe8c40350 (patch)
tree1485bc01fbdd9b6b8b8493c490ba4bf6f5cb4439 /cpu/mpc8260/speed.c
parent074acedbff821026ed47035e56a18600d789ce05 (diff)
parent92eb729bad876725aeea908d2addba0800620840 (diff)
downloadu-boot-imx-cce2adfb93ea31d21a2f69bbf68146dfe8c40350.zip
u-boot-imx-cce2adfb93ea31d21a2f69bbf68146dfe8c40350.tar.gz
u-boot-imx-cce2adfb93ea31d21a2f69bbf68146dfe8c40350.tar.bz2
Merge with git+ssh://sr@pollux.denx.org/home/sr/git/u-boot/denx/.git
Diffstat (limited to 'cpu/mpc8260/speed.c')
-rw-r--r--cpu/mpc8260/speed.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/cpu/mpc8260/speed.c b/cpu/mpc8260/speed.c
index 360404f..38cd0d9 100644
--- a/cpu/mpc8260/speed.c
+++ b/cpu/mpc8260/speed.c
@@ -25,6 +25,10 @@
#include <mpc8260.h>
#include <asm/processor.h>
+#if defined(CONFIG_BOARD_GET_CPU_CLK_F)
+extern unsigned long board_get_cpu_clk_f (void);
+#endif
+
DECLARE_GLOBAL_DATA_PTR;
/* ------------------------------------------------------------------------- */
@@ -112,8 +116,12 @@ int get_clocks (void)
#if !defined(CONFIG_8260_CLKIN)
#error clock measuring not implemented yet - define CONFIG_8260_CLKIN
#else
+#if defined(CONFIG_BOARD_GET_CPU_CLK_F)
+ clkin = board_get_cpu_clk_f ();
+#else
clkin = CONFIG_8260_CLKIN;
#endif
+#endif
sccr = immap->im_clkrst.car_sccr;
dfbrg = (sccr & SCCR_DFBRG_MSK) >> SCCR_DFBRG_SHIFT;