projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of rsync://rsync.denx.de/git/u-boot
[platform/kernel/u-boot.git]
/
cpu
/
ppc4xx
/
speed.c
diff --git
a/cpu/ppc4xx/speed.c
b/cpu/ppc4xx/speed.c
index
cbd7b24
..
02b4383
100644
(file)
--- a/
cpu/ppc4xx/speed.c
+++ b/
cpu/ppc4xx/speed.c
@@
-26,7
+26,7
@@
#include <ppc4xx.h>
#include <asm/processor.h>
#include <ppc4xx.h>
#include <asm/processor.h>
-/* ------------------------------------------------------------------------- */
+DECLARE_GLOBAL_DATA_PTR;
#define ONE_BILLION 1000000000
#define ONE_BILLION 1000000000
@@
-283,7
+283,7
@@
ulong get_PCI_freq (void)
return sys_info.freqPCI;
}
return sys_info.freqPCI;
}
-#elif !defined(CONFIG_440GX)
+#elif !defined(CONFIG_440GX)
&& !defined(CONFIG_440SP)
void get_sys_info (sys_info_t * sysInfo)
{
unsigned long strp0;
void get_sys_info (sys_info_t * sysInfo)
{
unsigned long strp0;
@@
-522,8
+522,6
@@
ulong get_PCI_freq (void)
int get_clocks (void)
{
#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) || defined(CONFIG_405) || defined(CONFIG_405EP)
int get_clocks (void)
{
#if defined(CONFIG_405GP) || defined(CONFIG_405CR) || defined(CONFIG_440) || defined(CONFIG_405) || defined(CONFIG_405EP)
- DECLARE_GLOBAL_DATA_PTR;
-
sys_info_t sys_info;
get_sys_info (&sys_info);
sys_info_t sys_info;
get_sys_info (&sys_info);
@@
-533,8
+531,6
@@
int get_clocks (void)
#endif /* defined(CONFIG_405GP) || defined(CONFIG_405CR) */
#ifdef CONFIG_IOP480
#endif /* defined(CONFIG_405GP) || defined(CONFIG_405CR) */
#ifdef CONFIG_IOP480
- DECLARE_GLOBAL_DATA_PTR;
-
gd->cpu_clk = 66000000;
gd->bus_clk = 66000000;
#endif
gd->cpu_clk = 66000000;
gd->bus_clk = 66000000;
#endif