Update cpuid table according to information sent by Scott Telford

in port-i386/11502, with only sligh change for Coppermine entry -
cpus with family 6, model 8 are not all Celerons, they can be
either common PIII, Xeon or Celeron
This commit is contained in:
jdolecek 2000-11-16 09:06:17 +00:00
parent dedc9b2e09
commit a9ad986a90
1 changed files with 12 additions and 8 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.415 2000/11/15 21:13:58 jdolecek Exp $ */ /* $NetBSD: machdep.c,v 1.416 2000/11/16 09:06:17 jdolecek Exp $ */
/*- /*-
* Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc. * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@ -625,10 +625,12 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = {
{ {
"Pentium Pro (A-step)", "Pentium Pro", 0, "Pentium Pro (A-step)", "Pentium Pro", 0,
"Pentium II (Klamath)", "Pentium Pro", "Pentium II (Klamath)", "Pentium Pro",
"Pentium II (Deschutes)", "Pentium II/Celeron (Deschutes)",
"Pentium II (Celeron)", "Celeron (Mendocino)",
"Pentium III", "Pentium III (E)", "Pentium III (Katmai)",
0, 0, 0, 0, 0, 0, 0, "Pentium III (Coppermine)",
0, "Pentium III Xeon (Cascades)", 0, 0,
0, 0,
"Pentium Pro, II or III" /* Default */ "Pentium Pro, II or III" /* Default */
}, },
NULL NULL
@ -667,7 +669,8 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = {
CPUCLASS_586, CPUCLASS_586,
{ {
"K5", "K5", "K5", "K5", 0, 0, "K6", "K5", "K5", "K5", "K5", 0, 0, "K6",
"K6", "K6-2", "K6-III", 0, 0, 0, 0, 0, 0, "K6", "K6-2", "K6-III", 0, 0, 0,
"K6-2+/III+", 0, 0,
"K5 or K6" /* Default */ "K5 or K6" /* Default */
}, },
NULL NULL
@ -676,8 +679,9 @@ struct cpu_cpuid_nameclass i386_cpuid_cpus[] = {
{ {
CPUCLASS_686, CPUCLASS_686,
{ {
0, "K7 (Athlon)", 0, 0, 0, 0, 0, 0, "Athlon Model 1", "Athlon Model 2",
0, 0, 0, 0, 0, 0, 0, 0, 0, "Duron", "Athlon Model 4 (Thunderbird)",
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
"K7 (Athlon)" /* Default */ "K7 (Athlon)" /* Default */
}, },
NULL NULL