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 commit 'wd/master'
[oweals/u-boot.git]
/
cpu
/
ppc4xx
/
speed.c
diff --git
a/cpu/ppc4xx/speed.c
b/cpu/ppc4xx/speed.c
index ef47ffc952198c35b287253b441c2445d2b3a815..ed6e55b698c6ab10235c0b1470109e687a094070 100644
(file)
--- a/
cpu/ppc4xx/speed.c
+++ b/
cpu/ppc4xx/speed.c
@@
-148,7
+148,7
@@
void get_sys_info (PPC4xx_SYS_INFO * sysInfo)
* is equal to the 405GP SYS_CLK_FREQ. If not in bypass mode, check VCO
* to make sure it is within the proper range.
* spec: VCO = SYS_CLOCK x FBKDIV x PLBDIV x FWDDIV
* is equal to the 405GP SYS_CLK_FREQ. If not in bypass mode, check VCO
* to make sure it is within the proper range.
* spec: VCO = SYS_CLOCK x FBKDIV x PLBDIV x FWDDIV
- * Note freqVCO is calculated in M
h
z to avoid errors introduced by rounding.
+ * Note freqVCO is calculated in M
H
z to avoid errors introduced by rounding.
*/
if (sysInfo->pllFwdDiv == 1) {
sysInfo->freqProcessor = CONFIG_SYS_CLK_FREQ;
*/
if (sysInfo->pllFwdDiv == 1) {
sysInfo->freqProcessor = CONFIG_SYS_CLK_FREQ;
@@
-205,7
+205,8
@@
ulong get_PCI_freq (void)
#elif defined(CONFIG_440)
#elif defined(CONFIG_440)
-#if defined(CONFIG_460EX) || defined(CONFIG_460GT)
+#if defined(CONFIG_460EX) || defined(CONFIG_460GT) || \
+ defined(CONFIG_460SX)
static u8 pll_fwdv_multi_bits[] = {
/* values for: 1 - 16 */
0x00, 0x01, 0x0f, 0x04, 0x09, 0x0a, 0x0d, 0x0e, 0x03, 0x0c,
static u8 pll_fwdv_multi_bits[] = {
/* values for: 1 - 16 */
0x00, 0x01, 0x0f, 0x04, 0x09, 0x0a, 0x0d, 0x0e, 0x03, 0x0c,
@@
-415,7
+416,8
@@
ulong get_PCI_freq (void)
return sys_info.freqPCI;
}
return sys_info.freqPCI;
}
-#elif !defined(CONFIG_440GX) && !defined(CONFIG_440SP) && !defined(CONFIG_440SPE)
+#elif !defined(CONFIG_440GX) && !defined(CONFIG_440SP) && !defined(CONFIG_440SPE) \
+ && !defined(CONFIG_XILINX_440)
void get_sys_info (sys_info_t * sysInfo)
{
unsigned long strp0;
void get_sys_info (sys_info_t * sysInfo)
{
unsigned long strp0;
@@
-448,6
+450,8
@@
void get_sys_info (sys_info_t * sysInfo)
sysInfo->freqUART = sysInfo->freqPLB;
}
#else
sysInfo->freqUART = sysInfo->freqPLB;
}
#else
+
+#if !defined(CONFIG_XILINX_440)
void get_sys_info (sys_info_t * sysInfo)
{
unsigned long strp0;
void get_sys_info (sys_info_t * sysInfo)
{
unsigned long strp0;
@@
-534,6
+538,7
@@
void get_sys_info (sys_info_t * sysInfo)
}
#endif
}
#endif
+#endif /* CONFIG_XILINX_440 */
#if defined(CONFIG_YUCCA)
unsigned long determine_sysper(void)
#if defined(CONFIG_YUCCA)
unsigned long determine_sysper(void)
@@
-754,7
+759,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);