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 git://www.denx.de/git/u-boot-at91
[platform/kernel/u-boot.git]
/
cpu
/
ppc4xx
/
speed.c
diff --git
a/cpu/ppc4xx/speed.c
b/cpu/ppc4xx/speed.c
index
8b4e64a
..
34bd721
100644
(file)
--- a/
cpu/ppc4xx/speed.c
+++ b/
cpu/ppc4xx/speed.c
@@
-754,7
+754,7
@@
ulong get_OPB_freq (void)
return sys_info.freqOPB;
}
return sys_info.freqOPB;
}
-#elif defined(CONFIG_XILINX_
ML300
)
+#elif defined(CONFIG_XILINX_
405
)
extern void get_sys_info (sys_info_t * sysInfo);
extern ulong get_PCI_freq (void);
extern void get_sys_info (sys_info_t * sysInfo);
extern ulong get_PCI_freq (void);
@@
-1126,7
+1126,7
@@
void get_sys_info (sys_info_t * sysInfo)
m = sysInfo->pllFwdDiv * plb2xDiv * 2
* sysInfo->pllOpbDiv * sysInfo->pllExtBusDiv;
break;
m = sysInfo->pllFwdDiv * plb2xDiv * 2
* sysInfo->pllOpbDiv * sysInfo->pllExtBusDiv;
break;
- case PLL_FBK_PLL_LOCAL:
+ case PLL_FBK_PLL_LOCAL:
break;
default:
printf("%s unknown m\n", __FUNCTION__);
break;
default:
printf("%s unknown m\n", __FUNCTION__);