Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch To determine CPU architecture and product, add cpu_...
details: https://anonhg.NetBSD.org/src/rev/4b5a00200412
branches: trunk
changeset: 522349:4b5a00200412
user: uch <uch%NetBSD.org@localhost>
date: Sun Feb 17 20:59:33 2002 +0000
description:
To determine CPU architecture and product, add cpu_arch and cpu_prduct variables.
these are initialized by sh_cpu_init()@sh3/sh3_machdep.c
(see sh3/include/cputypes.h for detail.)
add "options SH3" for SH3 kernel config file.
diffstat:
sys/arch/evbsh3/conf/COMPUTEXEVB | 3 +-
sys/arch/evbsh3/conf/CQREEKSH3 | 3 +-
sys/arch/hpcsh/conf/GENERIC | 9 +--
sys/arch/hpcsh/conf/HP620LX | 5 +-
sys/arch/hpcsh/conf/HPW650PA | 5 +-
sys/arch/hpcsh/conf/JORNADA690 | 7 +--
sys/arch/mmeye/conf/GENERIC | 5 +-
sys/arch/mmeye/conf/MMEYE | 3 +-
sys/arch/mmeye/conf/MMTA | 3 +-
sys/arch/mmeye/conf/MMTAICE | 3 +-
sys/arch/mmeye/conf/MMTANEW | 3 +-
sys/arch/mmeye/conf/MMTAROMNEW | 3 +-
sys/arch/sh3/include/cputypes.h | 97 ++++++++++++++++++++++-----------------
13 files changed, 81 insertions(+), 68 deletions(-)
diffs (truncated from 341 to 300 lines):
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/evbsh3/conf/COMPUTEXEVB
--- a/sys/arch/evbsh3/conf/COMPUTEXEVB Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/evbsh3/conf/COMPUTEXEVB Sun Feb 17 20:59:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: COMPUTEXEVB,v 1.13 2002/01/27 13:23:15 jdolecek Exp $
+# $NetBSD: COMPUTEXEVB,v 1.14 2002/02/17 20:59:35 uch Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -17,6 +17,7 @@
maxusers 32 # estimated number of users
# CPU support. At least one is REQUIRED.
+options SH3
options SH7709A,SH7709A_BROKEN_IPR # 100MHz
options PCLOCK=25000000 # 25.000MHz
options IOM_ROM_BEGIN=0x00000000
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/evbsh3/conf/CQREEKSH3
--- a/sys/arch/evbsh3/conf/CQREEKSH3 Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/evbsh3/conf/CQREEKSH3 Sun Feb 17 20:59:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CQREEKSH3,v 1.14 2002/01/27 13:23:15 jdolecek Exp $
+# $NetBSD: CQREEKSH3,v 1.15 2002/02/17 20:59:35 uch Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -19,6 +19,7 @@
maxusers 32 # estimated number of users
# CPU support. At least one is REQUIRED.
+options SH3
options SH7708 # 100MHz
options PCLOCK=15000000 # 15.000MHz
options IOM_ROM_BEGIN=0x00000000
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/hpcsh/conf/GENERIC
--- a/sys/arch/hpcsh/conf/GENERIC Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/hpcsh/conf/GENERIC Sun Feb 17 20:59:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.18 2002/02/11 17:18:35 uch Exp $
+# $NetBSD: GENERIC,v 1.19 2002/02/17 20:59:35 uch Exp $
#
# GENERIC machine description file
#
@@ -30,12 +30,11 @@
#options HD64461VIDEO_DEBUG
#options HD64461PCMCIA_DEBUG
-options SH7709A # 133MHz
-options SH7709A_BROKEN_IPR
+options SH3
options DDB # in-kernel debugger
-#options DIAGNOSTIC # extra kernel debugging checks
-#options DEBUG # extra kernel debugging support
+options DIAGNOSTIC # extra kernel debugging checks
+options DEBUG # extra kernel debugging support
options KTRACE # system call tracing support
options MSGBUFSIZE=65534
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/hpcsh/conf/HP620LX
--- a/sys/arch/hpcsh/conf/HP620LX Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/hpcsh/conf/HP620LX Sun Feb 17 20:59:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: HP620LX,v 1.7 2002/01/27 13:23:17 jdolecek Exp $
+# $NetBSD: HP620LX,v 1.8 2002/02/17 20:59:36 uch Exp $
#
# HP620LX
#
@@ -7,8 +7,7 @@
maxusers 32 # estimated number of users
-options SH7709A # 133MHz
-options SH7709A_BROKEN_IPR
+options SH3
options PCLOCK=18432000 # 18MHz
options DDB # in-kernel debugger
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/hpcsh/conf/HPW650PA
--- a/sys/arch/hpcsh/conf/HPW650PA Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/hpcsh/conf/HPW650PA Sun Feb 17 20:59:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: HPW650PA,v 1.2 2002/02/13 16:25:35 uch Exp $
+# $NetBSD: HPW650PA,v 1.3 2002/02/17 20:59:36 uch Exp $
#
# HITACHI PERSONA HPW650PA
#
@@ -10,8 +10,7 @@
options KLOADER_KERNEL_PATH="\"/netbsd\""
options KLOADER_DEBUG
-options SH7750
-options SH4
+options SH4
options INTERRUPT_MONITOR
options HPC_DEBUG_LCD
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/hpcsh/conf/JORNADA690
--- a/sys/arch/hpcsh/conf/JORNADA690 Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/hpcsh/conf/JORNADA690 Sun Feb 17 20:59:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: JORNADA690,v 1.14 2002/02/11 17:18:35 uch Exp $
+# $NetBSD: JORNADA690,v 1.15 2002/02/17 20:59:36 uch Exp $
#
# JORNADA690 uch's Jornada 690
#
@@ -7,10 +7,7 @@
maxusers 32 # estimated number of users
-options KLOADER_KERNEL_PATH="\"/netbsd\""
-
-options SH7709A # 133MHz
-options SH7709A_BROKEN_IPR
+options SH3
options PCLOCK=22000000 # 22MHz
options DDB # in-kernel debugger
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/mmeye/conf/GENERIC
--- a/sys/arch/mmeye/conf/GENERIC Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/mmeye/conf/GENERIC Sun Feb 17 20:59:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.32 2002/01/27 13:23:21 jdolecek Exp $
+# $NetBSD: GENERIC,v 1.33 2002/02/17 20:59:36 uch Exp $
#
# GENERIC machine description file
#
@@ -20,11 +20,12 @@
include "arch/mmeye/conf/std.mmeye"
-#ident "GENERIC-$Revision: 1.32 $"
+#ident "GENERIC-$Revision: 1.33 $"
maxusers 16 # estimated number of users
# CPU support
+options SH3
options SH7708R # 100MHz
options MMEYE
options MMEYE_NEW_INT
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/mmeye/conf/MMEYE
--- a/sys/arch/mmeye/conf/MMEYE Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/mmeye/conf/MMEYE Sun Feb 17 20:59:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE,v 1.9 2002/01/27 13:23:21 jdolecek Exp $
+# $NetBSD: MMEYE,v 1.10 2002/02/17 20:59:37 uch Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -8,6 +8,7 @@
maxusers 16 # estimated number of users
# CPU support
+options SH3
options SH7708R # 100MHz
options MMEYE
options MMEYE_NEW_INT
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/mmeye/conf/MMTA
--- a/sys/arch/mmeye/conf/MMTA Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/mmeye/conf/MMTA Sun Feb 17 20:59:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMTA,v 1.11 2002/02/10 17:37:00 wiz Exp $
+# $NetBSD: MMTA,v 1.12 2002/02/17 20:59:37 uch Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -14,6 +14,7 @@
maxusers 32 # estimated number of users
# Standard system options
+options SH3
options SH7708R # 100MHz
options PCLOCK=33330000 # 33.33MHz
options INITTODR_ALWAYS_USE_RTC
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/mmeye/conf/MMTAICE
--- a/sys/arch/mmeye/conf/MMTAICE Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/mmeye/conf/MMTAICE Sun Feb 17 20:59:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMTAICE,v 1.10 2002/02/10 17:37:00 wiz Exp $
+# $NetBSD: MMTAICE,v 1.11 2002/02/17 20:59:37 uch Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -17,6 +17,7 @@
#options I386_CPU
#options I486_CPU
#options I586_CPU
+options SH3
options SH7708 # 60MHz
#options SH7708R # 100MHz
#options I686_CPU
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/mmeye/conf/MMTANEW
--- a/sys/arch/mmeye/conf/MMTANEW Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/mmeye/conf/MMTANEW Sun Feb 17 20:59:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMTANEW,v 1.10 2002/02/10 17:37:00 wiz Exp $
+# $NetBSD: MMTANEW,v 1.11 2002/02/17 20:59:37 uch Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -14,6 +14,7 @@
maxusers 32 # estimated number of users
# Standard system options
+options SH3
options SH7708R # 100MHz
options PCLOCK=33330000 # 33.33MHz
options MMEYE_NEW_INT
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/mmeye/conf/MMTAROMNEW
--- a/sys/arch/mmeye/conf/MMTAROMNEW Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/mmeye/conf/MMTAROMNEW Sun Feb 17 20:59:33 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MMTAROMNEW,v 1.10 2002/02/10 17:37:01 wiz Exp $
+# $NetBSD: MMTAROMNEW,v 1.11 2002/02/17 20:59:37 uch Exp $
#
# GENERIC -- everything that's currently supported
#
@@ -15,6 +15,7 @@
maxusers 32 # estimated number of users
+options SH3
options PCLOCK=33330000 # 33.33MHz
options MMEYE_NEW_INT
#options MMEYE_NO_CACHE
diff -r 5ad7cf8c532e -r 4b5a00200412 sys/arch/sh3/include/cputypes.h
--- a/sys/arch/sh3/include/cputypes.h Sun Feb 17 20:58:35 2002 +0000
+++ b/sys/arch/sh3/include/cputypes.h Sun Feb 17 20:59:33 2002 +0000
@@ -1,7 +1,7 @@
-/* $NetBSD: cputypes.h,v 1.1 1999/09/13 10:31:16 itojun Exp $ */
+/* $NetBSD: cputypes.h,v 1.2 2002/02/17 20:59:33 uch Exp $ */
-/*
- * Copyright (c) 1993 Christopher G. Demetriou
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -12,49 +12,60 @@
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission
+ * 3. All advertising materials mentioning features or use of this software
+ * must display the following acknowledgement:
+ * This product includes software developed by the NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * Classes of Processor. CPU identification code depends on
- * this starting at 0, and having an increment of one.
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
*/
-#define CPUCLASS_SH3 0
+#ifndef _SH3_CPUTYPES_H_
+#define _SH3_CPUTYPES_H_
+#ifdef _KERNEL
+
+#define CPU_ARCH_SH3 3
+#define CPU_ARCH_SH4 4
-/*
- * Kinds of Processor. Only the first 1 are used, as they are processors
- * that might not have a cpuid instruction.
- */
-
-#define CPU_SH3 0 /* Hitachi SH3 */
-
-/*
- * CPU vendors
- */
Home |
Main Index |
Thread Index |
Old Index