kernel is called /bsd

4 files changed, 11 insertions, 291 deletions

diff --git a/sys/arch/pica/conf/XXX b/sys/arch/pica/conf/GENERIC
index 508707567a6..df6b7810081 100644
--- a/sys/arch/pica/conf/XXX
+++ b/sys/arch/pica/conf/GENERIC
@@ -1,9 +1,3 @@
-#
-# GENERIC DECstation (3100 or 5000/xxx)
-#
-#	first cut at new-style configu
-# 	$NetBSD: NEWCONF,v 1.1 1995/04/28 23:34:45 jonathan Exp $
-#
 include		"std.pica"
 
 maxusers	8
@@ -11,12 +5,10 @@ maxusers	8
 # does not really do anything anymore, but this replaces "ident GENERIC"
 options		GENERIC
 
-
 # Need to set locally
 options		TIMEZONE="8*60"		# minutes west of GMT (for)
 options		DST=1			# use daylight savings rules
 
-
 # Standard system options
 options		SWAPPAGER		# swap pager (anonymous and swap space)
 options		VNODEPAGER		# vnode pager (mapped files)
@@ -31,10 +23,10 @@ options		"NKMEMCLUSTERS=1024"	# 4K pages in kernel malloc pool
 #options	"KGDBDEV=15*256+0"	# device for kernel gdb
 
 # System V options
-options	SYSVMSG		# System V-like message queues
-options	SYSVSEM		# System V-like semaphores
-options	SYSVSHM		# System V-like memory sharing
-options	SHMMAXPGS=1024	# 1024 pages is the default
+options		SYSVMSG		# System V-like message queues
+options		SYSVSEM		# System V-like semaphores
+options		SYSVSHM		# System V-like memory sharing
+options		SHMMAXPGS=1024	# 1024 pages is the default
 
 # Filesystem options
 options		FIFO		# POSIX fifo support (in all filesystems)
@@ -60,24 +52,12 @@ options		GATEWAY		# IP packet forwarding
 #options	TPIP
 #options	EON
 
-# pmax/pica specific
-#options		COMPAT_ULTRIX	# ultrix compatibility
-
-# Use generic for swaping now....
-config		netbsd swap generic
-
-#####################################################################
-#                                                                   #
-#	PICA Mainbus, this is where the CPU hooks on...             #
-#                                                                   #
-#####################################################################
+config		bsd swap generic
 
 mainbus0	at root
-
 cpu*		at mainbus0
 
 pica*		at mainbus0
-
 clock0		at pica?
 pc0		at pica?
 pms0		at pica?
@@ -86,36 +66,18 @@ com1		at pica?
 lpt0		at pica?
 sn0		at pica?
 
-#####################################################################
-#                                                                   #
-#	Floppy disc controller and associated drives.               #
-#                                                                   #
-#####################################################################
-
 fdc0		at pica?
-
 fd*		at fdc? drive ?
 
-#####################################################################
-#                                                                   #
-#	SCSI bus and devices. Only asc driver for now.              #
-#       We want disk, tape and cd. (sd, st and cd).                 #
-#                                                                   #
-#####################################################################
-
 asc0		at pica?
+scsibus* 	at asc?
 
-scsibus*	at asc?
-
-sd*	at	scsibus?	target ? lun ?
-st*	at	scsibus?	target ? lun ?
-cd*	at	scsibus?	target ? lun ?
+sd*		at scsibus? target ? lun ?
+st*		at scsibus? target ? lun ?
+cd*		at scsibus? target ? lun ?
 
-#
-#	Pseudo devices
-#
 pseudo-device	sl		 4	# serial-line IP ports
 pseudo-device	pty		64	# pseudo ptys
 pseudo-device	bpfilter	16	# packet filter ports
 pseudo-device	loop
-pseudo-device	vnd		4	# viritual disk
+pseudo-device	vnd		4	# virtual disk
diff --git a/sys/arch/pica/conf/Makefile.pica b/sys/arch/pica/conf/Makefile.pica
index a6a603421a0..6fc55e2d6ad 100644
--- a/sys/arch/pica/conf/Makefile.pica
+++ b/sys/arch/pica/conf/Makefile.pica
@@ -111,7 +111,7 @@ newvers:
 	${CC} $(CFLAGS) -c vers.c
 
 clean::
-	rm -f eddep *vmunix vmunix.gdb tags *.o locore.i [a-z]*.s \
+	rm -f eddep bsd bsd.gdb tags *.o locore.i [a-z]*.s \
 		Errs errs linterrs makelinks genassym
 
 lint: /tmp param.c
diff --git a/sys/arch/pica/conf/NEWCONF b/sys/arch/pica/conf/NEWCONF
deleted file mode 100644
index d7e5c1fe035..00000000000
--- a/sys/arch/pica/conf/NEWCONF
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# GENERIC DECstation (3100 or 5000/xxx)
-#
-#	first cut at new-style configu
-# 	$NetBSD: NEWCONF,v 1.1 1995/04/28 23:34:45 jonathan Exp $
-#
-include		"std.pica"
-
-maxusers	8
-
-# does not really do anything anymore, but this replaces "ident GENERIC"
-options		GENERIC
-
-
-# Need to set locally
-options		TIMEZONE="8*60"		# minutes west of GMT (for)
-options		DST=1			# use daylight savings rules
-
-
-# Standard system options
-options		SWAPPAGER		# swap pager (anonymous and swap space)
-options		VNODEPAGER		# vnode pager (mapped files)
-options		DEVPAGER		# device pager (mapped devices)
-options		DIAGNOSTIC		# extra kernel debugging checks
-options		DEBUG			# extra kernel debugging support
-options		"COMPAT_43"		# compatibility with 4.3BSD binaries
-#options	KTRACE			# system call tracing support
-options		"NKMEMCLUSTERS=1024"	# 4K pages in kernel malloc pool
-#options	KGDB			# support for kernel gdb
-#options	"KGDBRATE=19200"	# kernel gdb port rate (default 9600)
-#options	"KGDBDEV=15*256+0"	# device for kernel gdb
-
-# System V options
-#options	SYSVMSG		# System V-like message queues
-#options	SYSVSEM		# System V-like semaphores
-#options	SYSVSHM		# System V-like memory sharing
-#options	SHMMAXPGS=1024	# 1024 pages is the default
-
-# Filesystem options
-options		FIFO		# POSIX fifo support (in all filesystems)
-options		FFS,QUOTA	# fast filesystem with user and group quotas
-options		MFS		# memory-based filesystem
-options		NFSCLIENT	# Sun NFS-compatible filesystem (client)
-options		NFSSERVER	# Sun NFS-compatible filesystem (server)
-options		KERNFS		# kernel data-structure filesystem
-options		MSDOSFS		# Ability to read write MS-Dos filsystem
-options		FDESC		# user file descriptor filesystem
-#options	UMAPFS		# uid/gid remapping filesystem
-#options	NULLFS		# null layer filesystem
-#options	LFS		# Log-based filesystem (still experimental)
-#options	PORTAL		# portal filesystem (still experimental)
-
-# Networking options
-options		INET		# Internet protocols
-options		"TCP_COMPAT_42"	# compatibility with 4.2BSD TCP/IP
-options		GATEWAY		# IP packet forwarding
-#options	MULTICAST	# Multicast support
-#options	MROUTING	# Multicast routing support
-#options	ISO		# OSI networking
-#options	TPIP
-#options	EON
-
-# pmax/pica specific
-options		COMPAT_ULTRIX	# ultrix compatibility
-
-# Use generic for swaping now....
-config		netbsd swap generic
-
-#####################################################################
-#                                                                   #
-#	PICA Mainbus, this is where the CPU hooks on...             #
-#                                                                   #
-#####################################################################
-
-mainbus0	at root
-
-cpu*		at mainbus0
-
-pica*		at mainbus0
-
-clock0		at pica?
-pc0		at pica?
-pms0		at pica?
-com0		at pica?
-com1		at pica?
-lpt0		at pica?
-le0		at pica?
-
-#####################################################################
-#                                                                   #
-#	Floppy disc controller and associated drives.               #
-#                                                                   #
-#####################################################################
-
-fdc0		at pica?
-
-fd*		at fdc? drive ?
-
-#####################################################################
-#                                                                   #
-#	SCSI bus and devices. Only asc driver for now.              #
-#       We want disk, tape and cd. (sd, st and cd).                 #
-#                                                                   #
-#####################################################################
-
-asc0		at pica?
-
-scsibus*	at asc?
-
-sd*	at	scsibus?	target ? lun ?
-st*	at	scsibus?	target ? lun ?
-cd*	at	scsibus?	target ? lun ?
-
-#
-#	Pseudo devices
-#
-pseudo-device	sl		 4	# serial-line IP ports
-pseudo-device	pty		64	# pseudo ptys
-pseudo-device	bpfilter	16	# packet filter ports
-pseudo-device	loop
-pseudo-device	vnd		4	# viritual disk
diff --git a/sys/arch/pica/conf/TEST b/sys/arch/pica/conf/TEST
deleted file mode 100644
index d7e5c1fe035..00000000000
--- a/sys/arch/pica/conf/TEST
+++ /dev/null
@@ -1,121 +0,0 @@
-#
-# GENERIC DECstation (3100 or 5000/xxx)
-#
-#	first cut at new-style configu
-# 	$NetBSD: NEWCONF,v 1.1 1995/04/28 23:34:45 jonathan Exp $
-#
-include		"std.pica"
-
-maxusers	8
-
-# does not really do anything anymore, but this replaces "ident GENERIC"
-options		GENERIC
-
-
-# Need to set locally
-options		TIMEZONE="8*60"		# minutes west of GMT (for)
-options		DST=1			# use daylight savings rules
-
-
-# Standard system options
-options		SWAPPAGER		# swap pager (anonymous and swap space)
-options		VNODEPAGER		# vnode pager (mapped files)
-options		DEVPAGER		# device pager (mapped devices)
-options		DIAGNOSTIC		# extra kernel debugging checks
-options		DEBUG			# extra kernel debugging support
-options		"COMPAT_43"		# compatibility with 4.3BSD binaries
-#options	KTRACE			# system call tracing support
-options		"NKMEMCLUSTERS=1024"	# 4K pages in kernel malloc pool
-#options	KGDB			# support for kernel gdb
-#options	"KGDBRATE=19200"	# kernel gdb port rate (default 9600)
-#options	"KGDBDEV=15*256+0"	# device for kernel gdb
-
-# System V options
-#options	SYSVMSG		# System V-like message queues
-#options	SYSVSEM		# System V-like semaphores
-#options	SYSVSHM		# System V-like memory sharing
-#options	SHMMAXPGS=1024	# 1024 pages is the default
-
-# Filesystem options
-options		FIFO		# POSIX fifo support (in all filesystems)
-options		FFS,QUOTA	# fast filesystem with user and group quotas
-options		MFS		# memory-based filesystem
-options		NFSCLIENT	# Sun NFS-compatible filesystem (client)
-options		NFSSERVER	# Sun NFS-compatible filesystem (server)
-options		KERNFS		# kernel data-structure filesystem
-options		MSDOSFS		# Ability to read write MS-Dos filsystem
-options		FDESC		# user file descriptor filesystem
-#options	UMAPFS		# uid/gid remapping filesystem
-#options	NULLFS		# null layer filesystem
-#options	LFS		# Log-based filesystem (still experimental)
-#options	PORTAL		# portal filesystem (still experimental)
-
-# Networking options
-options		INET		# Internet protocols
-options		"TCP_COMPAT_42"	# compatibility with 4.2BSD TCP/IP
-options		GATEWAY		# IP packet forwarding
-#options	MULTICAST	# Multicast support
-#options	MROUTING	# Multicast routing support
-#options	ISO		# OSI networking
-#options	TPIP
-#options	EON
-
-# pmax/pica specific
-options		COMPAT_ULTRIX	# ultrix compatibility
-
-# Use generic for swaping now....
-config		netbsd swap generic
-
-#####################################################################
-#                                                                   #
-#	PICA Mainbus, this is where the CPU hooks on...             #
-#                                                                   #
-#####################################################################
-
-mainbus0	at root
-
-cpu*		at mainbus0
-
-pica*		at mainbus0
-
-clock0		at pica?
-pc0		at pica?
-pms0		at pica?
-com0		at pica?
-com1		at pica?
-lpt0		at pica?
-le0		at pica?
-
-#####################################################################
-#                                                                   #
-#	Floppy disc controller and associated drives.               #
-#                                                                   #
-#####################################################################
-
-fdc0		at pica?
-
-fd*		at fdc? drive ?
-
-#####################################################################
-#                                                                   #
-#	SCSI bus and devices. Only asc driver for now.              #
-#       We want disk, tape and cd. (sd, st and cd).                 #
-#                                                                   #
-#####################################################################
-
-asc0		at pica?
-
-scsibus*	at asc?
-
-sd*	at	scsibus?	target ? lun ?
-st*	at	scsibus?	target ? lun ?
-cd*	at	scsibus?	target ? lun ?
-
-#
-#	Pseudo devices
-#
-pseudo-device	sl		 4	# serial-line IP ports
-pseudo-device	pty		64	# pseudo ptys
-pseudo-device	bpfilter	16	# packet filter ports
-pseudo-device	loop
-pseudo-device	vnd		4	# viritual disk