Module Name:    src
Committed By:   andvar
Date:           Tue Nov  7 21:39:30 UTC 2023

Modified Files:
        src/sys/arch/playstation2/conf: AGATE DEBUG std.playstation2

Log Message:
Remove ksyms from AGATE/DEBUG configs, it is defined in included default config.
Remove unneeded "channel ?" for atapibus* in DEBUG config.
Add "midi* at midibus?" needed for umidi to compile in DEBUG config.
Change SOFTFLOAT to FPEMUL in std.playstation2 (property was renamed).

playstation2 code was likely never fully restored/fixed and doesn't build, but
these changes would be needed in case someone will.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/playstation2/conf/AGATE
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/playstation2/conf/DEBUG
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/playstation2/conf/std.playstation2

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/playstation2/conf/AGATE
diff -u src/sys/arch/playstation2/conf/AGATE:1.13 src/sys/arch/playstation2/conf/AGATE:1.14
--- src/sys/arch/playstation2/conf/AGATE:1.13	Fri Aug 21 01:52:08 2015
+++ src/sys/arch/playstation2/conf/AGATE	Tue Nov  7 21:39:30 2023
@@ -1,7 +1,7 @@
 #
 # -- SCPH-18000 used by [email protected]
 #
-# 	$NetBSD: AGATE,v 1.13 2015/08/21 01:52:08 uebayasi Exp $
+# 	$NetBSD: AGATE,v 1.14 2023/11/07 21:39:30 andvar Exp $
 #
 
 include 	"arch/playstation2/conf/std.playstation2"
@@ -19,7 +19,6 @@ options 	KLOADER_KERNEL_PATH="\"/netbsd\
 options 	KLOADER
 
 options 	DDB			# in-kernel debugger
-pseudo-device	ksyms
 
 options 	NMBCLUSTERS=4096 # Max. number of mbuf clusters
 

Index: src/sys/arch/playstation2/conf/DEBUG
diff -u src/sys/arch/playstation2/conf/DEBUG:1.28 src/sys/arch/playstation2/conf/DEBUG:1.29
--- src/sys/arch/playstation2/conf/DEBUG:1.28	Tue Jun 29 10:22:36 2021
+++ src/sys/arch/playstation2/conf/DEBUG	Tue Nov  7 21:39:30 2023
@@ -1,7 +1,7 @@
 #
 # kernel config file for debugging.
 #
-# 	$NetBSD: DEBUG,v 1.28 2021/06/29 10:22:36 nia Exp $
+# 	$NetBSD: DEBUG,v 1.29 2023/11/07 21:39:30 andvar Exp $
 #
 
 include 	"arch/playstation2/conf/std.playstation2"
@@ -28,7 +28,6 @@ options 	NFSSERVER	# Network File System
 #options 	DIAGNOSTIC	# expensive kernel consistency checks
 options 	DEBUG			# extra kernel debugging support
 options 	DDB			# in-kernel debugger
-pseudo-device	ksyms
 options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
 options 	KTRACE			# system call tracing support
 options 	MSGBUFSIZE=8192		# dmesg buffer size
@@ -59,11 +58,12 @@ ucom*	at umodem?
 
 # USB Mass Storage
 umass*	at uhub? port ? configuration ? interface ?
-atapibus* at umass? channel ?
+atapibus* at umass?
 scsibus* at umass? channel ?
 
 # USB audio
 uaudio*	at uhub? port ? configuration ?
+midi*	at midibus?
 
 # USB MIDI
 umidi* at uhub? port ? configuration ?

Index: src/sys/arch/playstation2/conf/std.playstation2
diff -u src/sys/arch/playstation2/conf/std.playstation2:1.12 src/sys/arch/playstation2/conf/std.playstation2:1.13
--- src/sys/arch/playstation2/conf/std.playstation2:1.12	Fri Jun  4 10:46:11 2021
+++ src/sys/arch/playstation2/conf/std.playstation2	Tue Nov  7 21:39:30 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: std.playstation2,v 1.12 2021/06/04 10:46:11 martin Exp $
+#	$NetBSD: std.playstation2,v 1.13 2023/11/07 21:39:30 andvar Exp $
 
 machine playstation2 mips
 include		"conf/std"	# MI standard options
@@ -10,7 +10,7 @@ options 	MIPS3_5900
 options 	IPL_ICU_MASK
 
 options 	NOFPU		# Don't use FPU (R5900 FPU is single float only)
-options 	SOFTFLOAT	# emulate FPU insn
+options 	FPEMUL		# emulate FPU insn
 
 options 	EXEC_ELF32	# exec ELF32 binaries
 options 	EXEC_SCRIPT	# exec #! scripts

Reply via email to