Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 14 Jan 2015 01:23:51 +0000 (UTC)
From:      Ganbold Tsagaankhuu <ganbold@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r277156 - in head/sys/arm: arm include
Message-ID:  <201501140123.t0E1NpF6049767@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ganbold
Date: Wed Jan 14 01:23:50 2015
New Revision: 277156
URL: https://svnweb.freebsd.org/changeset/base/277156

Log:
  Correct cpu type, it was rather Cortex A12 R0.
  
  Approved by:    stas (mentor)

Modified:
  head/sys/arm/arm/cpufunc.c
  head/sys/arm/arm/identcpu.c
  head/sys/arm/include/armreg.h

Modified: head/sys/arm/arm/cpufunc.c
==============================================================================
--- head/sys/arm/arm/cpufunc.c	Tue Jan 13 22:51:44 2015	(r277155)
+++ head/sys/arm/arm/cpufunc.c	Wed Jan 14 01:23:50 2015	(r277156)
@@ -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 */

Modified: head/sys/arm/arm/identcpu.c
==============================================================================
--- head/sys/arm/arm/identcpu.c	Tue Jan 13 22:51:44 2015	(r277155)
+++ head/sys/arm/arm/identcpu.c	Wed Jan 14 01:23:50 2015	(r277156)
@@ -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 },
 

Modified: head/sys/arm/include/armreg.h
==============================================================================
--- head/sys/arm/include/armreg.h	Tue Jan 13 22:51:44 2015	(r277155)
+++ head/sys/arm/include/armreg.h	Wed Jan 14 01:23:50 2015	(r277156)
@@ -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 */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501140123.t0E1NpF6049767>