summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-03-24 00:21:24 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-03-24 00:21:24 +0000
commita5fdefb1b7e63183cef21509131dbdb436ee203e (patch)
treee57066610b8c4938e7fb598531b44bf2b5b8c90f /sys/arch
parent5023f381efbbc0f9c381d2f9e0ed5d2bb53ff988 (diff)
handle NS Geode GX1; wd@ics.nara-wu.ac.jp
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/i386/i386/machdep.c27
-rw-r--r--sys/arch/i386/include/cputypes.h3
2 files changed, 28 insertions, 2 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 47ff4f36063..b0bed01a632 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.202 2002/03/23 13:28:34 espie Exp $ */
+/* $OpenBSD: machdep.c,v 1.203 2002/03/24 00:21:23 deraadt Exp $ */
/* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */
/*-
@@ -934,6 +934,31 @@ const struct cpu_cpuid_nameclass i386_cpuid_cpus[] = {
},
NULL
} }
+ },
+ {
+ "Geode by NSC",
+ CPUVENDOR_NS,
+ "National Semiconductor",
+ /* Family 4, not available from National Semiconductor */
+ { {
+ CPUCLASS_486,
+ {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ "486 class" /* Default */
+ },
+ NULL
+ },
+ /* Family 5 */
+ {
+ CPUCLASS_586,
+ {
+ 0, 0, 0, 0, "Geode GX1", 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0,
+ "M1 class" /* Default */
+ },
+ cyrix6x86_cpu_setup
+ } }
}
};
diff --git a/sys/arch/i386/include/cputypes.h b/sys/arch/i386/include/cputypes.h
index 05e731a74aa..63c3cfc1175 100644
--- a/sys/arch/i386/include/cputypes.h
+++ b/sys/arch/i386/include/cputypes.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cputypes.h,v 1.7 2001/01/25 04:39:45 deraadt Exp $ */
+/* $OpenBSD: cputypes.h,v 1.8 2002/03/24 00:21:23 deraadt Exp $ */
/* $NetBSD: cputypes.h,v 1.10 1997/10/18 04:51:03 mikel Exp $ */
/*
@@ -67,6 +67,7 @@
#define CPUVENDOR_IDT 4
#define CPUVENDOR_RISE 5
#define CPUVENDOR_TRANSMETA 6
+#define CPUVENDOR_NS 7
/*
* Some other defines, dealing with values returned by cpuid.