summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorganbold <ganbold@FreeBSD.org>2015-01-14 01:23:50 +0000
committerganbold <ganbold@FreeBSD.org>2015-01-14 01:23:50 +0000
commitccf3c6bca79628211857d8f91a7c5cff3d5297d9 (patch)
tree7048fac4028bd17f0174bd0daddfc93d4df58489
parent31bf2a65cca2098486f3492c627863fa7a50f88d (diff)
downloadFreeBSD-src-ccf3c6bca79628211857d8f91a7c5cff3d5297d9.zip
FreeBSD-src-ccf3c6bca79628211857d8f91a7c5cff3d5297d9.tar.gz
Correct cpu type, it was rather Cortex A12 R0.
Approved by: stas (mentor)
-rw-r--r--sys/arm/arm/cpufunc.c2
-rw-r--r--sys/arm/arm/identcpu.c4
-rw-r--r--sys/arm/include/armreg.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c
index c4f0f7f..8e69c54 100644
--- a/sys/arm/arm/cpufunc.c
+++ b/sys/arm/arm/cpufunc.c
@@ -1067,11 +1067,11 @@ set_cpufuncs()
cputype == CPU_ID_CORTEXA9R1 ||
cputype == CPU_ID_CORTEXA9R2 ||
cputype == CPU_ID_CORTEXA9R3 ||
+ cputype == CPU_ID_CORTEXA12R0 ||
cputype == CPU_ID_CORTEXA15R0 ||
cputype == CPU_ID_CORTEXA15R1 ||
cputype == CPU_ID_CORTEXA15R2 ||
cputype == CPU_ID_CORTEXA15R3 ||
- cputype == CPU_ID_CORTEXA17 ||
cputype == CPU_ID_KRAIT ) {
cpufuncs = cortexa_cpufuncs;
cpu_reset_needs_v4_MMU_disable = 1; /* V4 or higher */
diff --git a/sys/arm/arm/identcpu.c b/sys/arm/arm/identcpu.c
index b4b757c..b37a1b3 100644
--- a/sys/arm/arm/identcpu.c
+++ b/sys/arm/arm/identcpu.c
@@ -185,6 +185,8 @@ const struct cpuidtab cpuids[] = {
generic_steppings },
{ CPU_ID_CORTEXA9R3, CPU_CLASS_CORTEXA, "Cortex A9-r3",
generic_steppings },
+ { CPU_ID_CORTEXA12R0, CPU_CLASS_CORTEXA, "Cortex A12-r0",
+ generic_steppings },
{ CPU_ID_CORTEXA15R0, CPU_CLASS_CORTEXA, "Cortex A15-r0",
generic_steppings },
{ CPU_ID_CORTEXA15R1, CPU_CLASS_CORTEXA, "Cortex A15-r1",
@@ -193,8 +195,6 @@ const struct cpuidtab cpuids[] = {
generic_steppings },
{ CPU_ID_CORTEXA15R3, CPU_CLASS_CORTEXA, "Cortex A15-r3",
generic_steppings },
- { CPU_ID_CORTEXA17, CPU_CLASS_CORTEXA, "Cortex A17",
- generic_steppings },
{ CPU_ID_KRAIT, CPU_CLASS_KRAIT, "Krait",
generic_steppings },
diff --git a/sys/arm/include/armreg.h b/sys/arm/include/armreg.h
index 216fe2a..4d0078c 100644
--- a/sys/arm/include/armreg.h
+++ b/sys/arm/include/armreg.h
@@ -133,11 +133,11 @@
#define CPU_ID_CORTEXA9R1 0x411fc090
#define CPU_ID_CORTEXA9R2 0x412fc090
#define CPU_ID_CORTEXA9R3 0x413fc090
+#define CPU_ID_CORTEXA12R0 0x410fc0d0
#define CPU_ID_CORTEXA15R0 0x410fc0f0
#define CPU_ID_CORTEXA15R1 0x411fc0f0
#define CPU_ID_CORTEXA15R2 0x412fc0f0
#define CPU_ID_CORTEXA15R3 0x413fc0f0
-#define CPU_ID_CORTEXA17 0x410fc0d0
#define CPU_ID_KRAIT 0x510f06f0 /* Snapdragon S4 Pro/APQ8064 */
#define CPU_ID_TI925T 0x54029250
#define CPU_ID_MV88FR131 0x56251310 /* Marvell Feroceon 88FR131 Core */
OpenPOWER on IntegriCloud