summaryrefslogtreecommitdiff
path: root/cpu/mpc8260
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-12-06 23:55:10 +0000
committerwdenk <wdenk>2003-12-06 23:55:10 +0000
commit5779d8d985d95104ad74332f5fa3cb6c67645509 (patch)
treefe9c2bacd2e097b24c4968ae8e929bd28d74c167 /cpu/mpc8260
parent8bf3b005ddee3eee179ec961e1c2bd0693e3b79d (diff)
downloadu-boot-imx-5779d8d985d95104ad74332f5fa3cb6c67645509.zip
u-boot-imx-5779d8d985d95104ad74332f5fa3cb6c67645509.tar.gz
u-boot-imx-5779d8d985d95104ad74332f5fa3cb6c67645509.tar.bz2
* Patch by Nicolas Lacressonnière, 12 Nov 2003:
update for for Atmel AT91RM9200DK development kit: - support for environment variables in DataFlash - Atmel DataFlash AT45DB1282 support * Patch by Jeff Carr, 11 Nov 2003: add support for new version of 8270 processors * Patches by George G. Davis, 05 Nov 2003: - only pass the ARM linux initrd tag to the kernel when an initrd is actually present - update omap1510inn configuration file
Diffstat (limited to 'cpu/mpc8260')
-rw-r--r--cpu/mpc8260/cpu.c1
-rw-r--r--cpu/mpc8260/speed.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c
index f4f5279..db8b89e 100644
--- a/cpu/mpc8260/cpu.c
+++ b/cpu/mpc8260/cpu.c
@@ -67,6 +67,7 @@ int checkcpu (void)
case PVR_8260_HIP4:
k = 4;
break;
+ case PVR_8260_HIP7R1:
case PVR_8260_HIP7:
k = 7;
break;
diff --git a/cpu/mpc8260/speed.c b/cpu/mpc8260/speed.c
index 6a3176a..a20f612 100644
--- a/cpu/mpc8260/speed.c
+++ b/cpu/mpc8260/speed.c
@@ -125,7 +125,7 @@ int get_clocks (void)
busdf = (scmr & SCMR_BUSDF_MSK) >> SCMR_BUSDF_SHIFT;
cpmdf = (scmr & SCMR_CPMDF_MSK) >> SCMR_CPMDF_SHIFT;
- if (get_pvr () == PVR_8260_HIP7) { /* HiP7 */
+ if ((get_pvr () == PVR_8260_HIP7) || (get_pvr () == PVR_8260_HIP7R1)) { /* HiP7 */
pllmf = (scmr & SCMR_PLLMF_MSKH7) >> SCMR_PLLMF_SHIFT;
gd->vco_out = clkin * (pllmf + 1);
} else { /* HiP3, HiP4 */