projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with /home/hs/MAN/u-boot-dev
[oweals/u-boot.git]
/
cpu
/
mpc8260
/
speed.c
diff --git
a/cpu/mpc8260/speed.c
b/cpu/mpc8260/speed.c
index 360404f0cfd444807fe1a98a5c4d23f72fa948d9..38cd0d9a70fd0ecdcbc874aa25d95957bd405dcc 100644
(file)
--- a/
cpu/mpc8260/speed.c
+++ b/
cpu/mpc8260/speed.c
@@
-25,6
+25,10
@@
#include <mpc8260.h>
#include <asm/processor.h>
#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;
/* ------------------------------------------------------------------------- */
DECLARE_GLOBAL_DATA_PTR;
/* ------------------------------------------------------------------------- */
@@
-111,8
+115,12
@@
int get_clocks (void)
#if !defined(CONFIG_8260_CLKIN)
#error clock measuring not implemented yet - define CONFIG_8260_CLKIN
#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;
#else
clkin = CONFIG_8260_CLKIN;
+#endif
#endif
sccr = immap->im_clkrst.car_sccr;
#endif
sccr = immap->im_clkrst.car_sccr;