Module Name:    src
Committed By:   thorpej
Date:           Thu Jan 18 03:40:48 UTC 2024

Modified Files:
        src/sys/arch/hp300/conf: files.hp300
        src/sys/arch/hp300/include: hp300spu.h

Log Message:
Rather than testing for and defining the M680x0 CPU option in
hp300spu.h, make the individual model options (e.g. HP320, HP425,
etc.) declare a dependency on the correponding M680x0 options.
This makes them appear correctly in opt_m68k_arch.h rather than
having to pull in all of <machine/cpu.h>.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/hp300/conf/files.hp300
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hp300/include/hp300spu.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/hp300/conf/files.hp300
diff -u src/sys/arch/hp300/conf/files.hp300:1.95 src/sys/arch/hp300/conf/files.hp300:1.96
--- src/sys/arch/hp300/conf/files.hp300:1.95	Tue Jan 16 03:44:43 2024
+++ src/sys/arch/hp300/conf/files.hp300	Thu Jan 18 03:40:48 2024
@@ -1,4 +1,4 @@
-#	$NetBSD: files.hp300,v 1.95 2024/01/16 03:44:43 thorpej Exp $
+#	$NetBSD: files.hp300,v 1.96 2024/01/18 03:40:48 thorpej Exp $
 #
 # hp300-specific configuration info
 
@@ -8,8 +8,23 @@ maxpartitions 8
 maxusers 2 8 64
 
 # SPU configuration options.
-defflag	opt_spuconf.h	HP320 HP330 HP340 HP345 HP350 HP360 HP362 HP370
-			HP375 HP380 HP382 HP385 HP400 HP425 HP433
+defflag	opt_spuconf.h	HP320: M68020
+defflag	opt_spuconf.h	HP330: M68020
+defflag	opt_spuconf.h	HP350: M68020
+
+defflag	opt_spuconf.h	HP340: M68030
+defflag	opt_spuconf.h	HP345: M68030
+defflag	opt_spuconf.h	HP360: M68030
+defflag	opt_spuconf.h	HP362: M68030
+defflag	opt_spuconf.h	HP370: M68030
+defflag	opt_spuconf.h	HP375: M68030
+defflag	opt_spuconf.h	HP400: M68030
+
+defflag	opt_spuconf.h	HP380: M68040
+defflag	opt_spuconf.h	HP382: M68040
+defflag	opt_spuconf.h	HP385: M68040
+defflag	opt_spuconf.h	HP425: M68040
+defflag	opt_spuconf.h	HP433: M68040
 
 # Misc. options.
 defflag			USELEDS		# make the lights twinkle

Index: src/sys/arch/hp300/include/hp300spu.h
diff -u src/sys/arch/hp300/include/hp300spu.h:1.14 src/sys/arch/hp300/include/hp300spu.h:1.15
--- src/sys/arch/hp300/include/hp300spu.h:1.14	Sun Jun  6 04:50:06 2010
+++ src/sys/arch/hp300/include/hp300spu.h	Thu Jan 18 03:40:48 2024
@@ -1,4 +1,4 @@
-/*	$NetBSD: hp300spu.h,v 1.14 2010/06/06 04:50:06 mrg Exp $	*/
+/*	$NetBSD: hp300spu.h,v 1.15 2024/01/18 03:40:48 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -90,23 +90,6 @@ extern	int mmuid;		/* MMU id */
 #endif
 
 /*
- * CPU configuration.
- */
-#if defined(HP320) || defined(HP330) || defined(HP350)
-#define M68020
-#endif
-
-#if defined(HP340) || defined(HP345) || defined(HP360) || defined(HP362) || \
-    defined(HP370) || defined(HP375) || defined(HP400)
-#define M68030
-#endif
-
-#if defined(HP380) || defined(HP382) || defined(HP385) || defined(HP425) || \
-    defined(HP433)
-#define M68040
-#endif
-
-/*
  * MMU configuration.
  */
 #if defined(HP320) || defined(HP350)

Reply via email to