summaryrefslogtreecommitdiff
path: root/cpu
diff options
context:
space:
mode:
authorroy zang <tie-fei.zang@freescale.com>2007-02-12 11:24:27 +0800
committerZang Tiefei <roy@bus.ap.freescale.net>2007-02-12 11:24:27 +0800
commit30bddf2c46ab2e824f217a38db033118ac4622af (patch)
tree2969155507e6902a7dddebad6c7c9ba259e816be /cpu
parentc1c52e38d35ff01f08b55377126c979a08fbdb1d (diff)
parentb0b1a920aebead0d44146e73676ae9d80fffc8e2 (diff)
downloadu-boot-imx-30bddf2c46ab2e824f217a38db033118ac4622af.zip
u-boot-imx-30bddf2c46ab2e824f217a38db033118ac4622af.tar.gz
u-boot-imx-30bddf2c46ab2e824f217a38db033118ac4622af.tar.bz2
Merge branch 'master' into hpc2
Diffstat (limited to 'cpu')
-rw-r--r--cpu/ppc4xx/cpu.c28
1 files changed, 18 insertions, 10 deletions
diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c
index 57a7e8d..b02f6f4 100644
--- a/cpu/ppc4xx/cpu.c
+++ b/cpu/ppc4xx/cpu.c
@@ -88,14 +88,18 @@ int pci_arbiter_enabled(void)
return (mfdcr(cpc0_strp1) & CPC0_STRP1_PAE_MASK);
#endif
-#if defined(CONFIG_440GX) || \
- defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
- defined(CONFIG_440EPX) || defined(CONFIG_440GRX) || \
- defined(CONFIG_440SP) || defined(CONFIG_440SPE)
+#if defined(CONFIG_440GX) || defined(CONFIG_440SP) || defined(CONFIG_440SPE)
unsigned long val;
- mfsdr(sdr_sdstp1, val);
- return (val & SDR0_SDSTP1_PAE_MASK);
+ mfsdr(sdr_xcr, val);
+ return (val & 0x80000000);
+#endif
+#if defined(CONFIG_440EP) || defined(CONFIG_440GR) || \
+ defined(CONFIG_440EPX) || defined(CONFIG_440GRX)
+ unsigned long val;
+
+ mfsdr(sdr_pci0, val);
+ return (val & 0x80000000);
#endif
}
#endif
@@ -312,25 +316,29 @@ int checkcpu (void)
#endif /* CONFIG_440GR */
#endif /* CONFIG_440 */
- case PVR_440EPX1_RA:
+#ifdef CONFIG_440EPX
+ case PVR_440EPX1_RA: /* 440EPx rev A and 440GRx rev A have same PVR */
puts("EPx Rev. A");
strcpy(addstr, "Security/Kasumi support");
break;
- case PVR_440EPX2_RA:
+ case PVR_440EPX2_RA: /* 440EPx rev A and 440GRx rev A have same PVR */
puts("EPx Rev. A");
strcpy(addstr, "No Security/Kasumi support");
break;
+#endif /* CONFIG_440EPX */
- case PVR_440GRX1_RA:
+#ifdef CONFIG_440GRX
+ case PVR_440GRX1_RA: /* 440EPx rev A and 440GRx rev A have same PVR */
puts("GRx Rev. A");
strcpy(addstr, "Security/Kasumi support");
break;
- case PVR_440GRX2_RA:
+ case PVR_440GRX2_RA: /* 440EPx rev A and 440GRx rev A have same PVR */
puts("GRx Rev. A");
strcpy(addstr, "No Security/Kasumi support");
break;
+#endif /* CONFIG_440GRX */
case PVR_440SP_6_RAB:
puts("SP Rev. A/B");