projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mpc8641: Support 36-bit physical addressing
[oweals/u-boot.git]
/
cpu
/
mcf532x
/
cpu.c
diff --git
a/cpu/mcf532x/cpu.c
b/cpu/mcf532x/cpu.c
index 260d6e67557c5ebef9b509c351399b7303ba06e9..331cc15da4ce79579020d4689ec6cb90cc3eacb8 100644
(file)
--- a/
cpu/mcf532x/cpu.c
+++ b/
cpu/mcf532x/cpu.c
@@
-3,7
+3,7
@@
* (C) Copyright 2000-2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
* (C) Copyright 2000-2003
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
- * Copyright (C) 2004-200
7
Freescale Semiconductor, Inc.
+ * Copyright (C) 2004-200
8
Freescale Semiconductor, Inc.
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
*
* See file CREDITS for list of people who contributed to this
* TsiChung Liew (Tsi-Chung.Liew@freescale.com)
*
* See file CREDITS for list of people who contributed to this
@@
-56,6
+56,24
@@
int checkcpu(void)
msk = (ccm->cir >> 6);
ver = (ccm->cir & 0x003f);
switch (msk) {
msk = (ccm->cir >> 6);
ver = (ccm->cir & 0x003f);
switch (msk) {
+#ifdef CONFIG_MCF5301x
+ case 0x78:
+ id = 53010;
+ break;
+ case 0x77:
+ id = 53012;
+ break;
+ case 0x76:
+ id = 53015;
+ break;
+ case 0x74:
+ id = 53011;
+ break;
+ case 0x73:
+ id = 53013;
+ break;
+#endif
+#ifdef CONFIG_MCF532x
case 0x54:
id = 5329;
break;
case 0x54:
id = 5329;
break;
@@
-77,14
+95,17
@@
int checkcpu(void)
case 0x6B:
id = 5372;
break;
case 0x6B:
id = 5372;
break;
+#endif
}
if (id) {
}
if (id) {
+ char buf1[32], buf2[32];
+
printf("Freescale MCF%d (Mask:%01x Version:%x)\n", id, msk,
ver);
printf("Freescale MCF%d (Mask:%01x Version:%x)\n", id, msk,
ver);
- printf(" CPU CLK %
d Mhz BUS CLK %d Mh
z\n",
-
(int)(gd->cpu_clk / 1000000
),
-
(int)(gd->bus_clk / 1000000
));
+ printf(" CPU CLK %
s MHz BUS CLK %s MH
z\n",
+
strmhz(buf1, gd->cpu_clk
),
+
strmhz(buf2, gd->bus_clk
));
}
return 0;
}
return 0;
@@
-117,7
+138,7
@@
int watchdog_init(void)
u32 wdog_module = 0;
/* set timeout and enable watchdog */
u32 wdog_module = 0;
/* set timeout and enable watchdog */
- wdog_module = ((C
FG
_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT);
+ wdog_module = ((C
ONFIG_SYS
_CLK / 1000) * CONFIG_WATCHDOG_TIMEOUT);
#ifdef CONFIG_M5329
wdp->mr = (wdog_module / 8192);
#else
#ifdef CONFIG_M5329
wdp->mr = (wdog_module / 8192);
#else