Module Name: src
Committed By: jmcneill
Date: Tue Jul 16 10:37:12 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c
src/sys/arch/arm/include: cputypes.h
Log Message:
Add Ampere eMAG 8180 cpuid
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/include/cputypes.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.18 src/sys/arch/aarch64/aarch64/cpu.c:1.19
--- src/sys/arch/aarch64/aarch64/cpu.c:1.18 Wed Jun 19 05:31:05 2019
+++ src/sys/arch/aarch64/aarch64/cpu.c Tue Jul 16 10:37:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.18 2019/06/19 05:31:05 mrg Exp $ */
+/* $NetBSD: cpu.c,v 1.19 2019/07/16 10:37:12 jmcneill Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.18 2019/06/19 05:31:05 mrg Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.19 2019/07/16 10:37:12 jmcneill Exp $");
#include "locators.h"
#include "opt_arm_debug.h"
@@ -195,6 +195,7 @@ const struct cpuidtab cpuids[] = {
{ CPU_ID_CORTEXA76R3 & CPU_PARTMASK, "Cortex-A76", "Cortex", "V8.2-A+" },
{ CPU_ID_CORTEXA76AER1 & CPU_PARTMASK, "Cortex-A76AE", "Cortex", "V8.2-A+" },
{ CPU_ID_CORTEXA77R0 & CPU_PARTMASK, "Cortex-A77", "Cortex", "V8.2-A+" },
+ { CPU_ID_EMAG8180, "Ampere eMAG 8180", "Skylark", "V8-A" },
{ CPU_ID_THUNDERXRX, "Cavium ThunderX", "Cavium", "V8-A" },
{ CPU_ID_THUNDERX81XXRX, "Cavium ThunderX CN81XX", "Cavium", "V8-A" },
{ CPU_ID_THUNDERX83XXRX, "Cavium ThunderX CN83XX", "Cavium", "V8-A" },
Index: src/sys/arch/arm/include/cputypes.h
diff -u src/sys/arch/arm/include/cputypes.h:1.7 src/sys/arch/arm/include/cputypes.h:1.8
--- src/sys/arch/arm/include/cputypes.h:1.7 Wed Jun 19 05:31:05 2019
+++ src/sys/arch/arm/include/cputypes.h Tue Jul 16 10:37:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cputypes.h,v 1.7 2019/06/19 05:31:05 mrg Exp $ */
+/* $NetBSD: cputypes.h,v 1.8 2019/07/16 10:37:12 jmcneill Exp $ */
/*
* Copyright (c) 1998, 2001 Ben Harris
@@ -203,6 +203,7 @@
#define CPU_ID_SA110 0x4401a100
#define CPU_ID_SA1100 0x4401a110
+#define CPU_ID_EMAG8180 0x503f0002
#define CPU_ID_TI925T 0x54029250
#define CPU_ID_MV88FR571_VD 0x56155710
#define CPU_ID_MV88SV131 0x56251310
