[src/trunk]: src/sys/arch/sh3 * Defflag the SH3 and SH4 options.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5bac01c31ceb
branches:  trunk
changeset: 525911:5bac01c31ceb
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sat Apr 20 19:59:11 2002 +0000

description:
* Defflag the SH3 and SH4 options.
* In <sh3/cputypes.h>, always define both SH3 and SH4 if _LKM is defined.

diffstat:

 sys/arch/sh3/conf/files.sh3     |   4 +++-
 sys/arch/sh3/include/cputypes.h |  14 +++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diffs (56 lines):

diff -r 58c08ecf6e0e -r 5bac01c31ceb sys/arch/sh3/conf/files.sh3
--- a/sys/arch/sh3/conf/files.sh3       Sat Apr 20 17:36:16 2002 +0000
+++ b/sys/arch/sh3/conf/files.sh3       Sat Apr 20 19:59:11 2002 +0000
@@ -1,6 +1,8 @@
-#      $NetBSD: files.sh3,v 1.25 2002/03/27 10:44:39 uch Exp $
+#      $NetBSD: files.sh3,v 1.26 2002/04/20 19:59:11 thorpej Exp $
 #
 
+defflag        opt_cputype.h           SH3 SH4
+
 defparam       PCLOCK
 defflag        opt_kstack_debug.h      KSTACK_DEBUG
 
diff -r 58c08ecf6e0e -r 5bac01c31ceb sys/arch/sh3/include/cputypes.h
--- a/sys/arch/sh3/include/cputypes.h   Sat Apr 20 17:36:16 2002 +0000
+++ b/sys/arch/sh3/include/cputypes.h   Sat Apr 20 19:59:11 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cputypes.h,v 1.4 2002/04/16 17:33:56 uch Exp $ */
+/*     $NetBSD: cputypes.h,v 1.5 2002/04/20 19:59:12 thorpej Exp $     */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -35,8 +35,17 @@
 
 #ifndef _SH3_CPUTYPES_H_
 #define _SH3_CPUTYPES_H_
+
 #ifdef _KERNEL
 
+#if defined(_KERNEL_OPT)
+#include "opt_cputype.h"
+#elif defined(_LKM)
+/* If building an LKM, include both SH3 and SH4 support. */
+#define        SH3
+#define        SH4
+#endif
+
 #define CPU_ARCH_SH3           3
 #define CPU_ARCH_SH4           4
 
@@ -46,6 +55,7 @@
 #define CPU_PRODUCT_7708R      3
 #define CPU_PRODUCT_7709       4
 #define CPU_PRODUCT_7709A      5
+
 /* SH4 series */
 #define CPU_PRODUCT_7750       6
 #define CPU_PRODUCT_7750S      7
@@ -72,5 +82,7 @@
 #error "define SH3 and/or SH4"
 #endif
 #endif /* !_LOCORE */
+
 #endif /* _KERNEL */
+
 #endif /* !_SH3_CPUTYPES_H_ */