summaryrefslogtreecommitdiff
path: root/sys/arch/hp300/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/hp300/conf')
-rw-r--r--sys/arch/hp300/conf/DISKLESS139
-rw-r--r--sys/arch/hp300/conf/GENERIC209
-rw-r--r--sys/arch/hp300/conf/Makefile.hp3004
-rw-r--r--sys/arch/hp300/conf/NEWCONFIG148
-rw-r--r--sys/arch/hp300/conf/devices.hp300.oldconf6
-rw-r--r--sys/arch/hp300/conf/files.hp30012
-rw-r--r--sys/arch/hp300/conf/files.hp300.oldconf75
-rw-r--r--sys/arch/hp300/conf/std.hp30016
8 files changed, 183 insertions, 426 deletions
diff --git a/sys/arch/hp300/conf/DISKLESS b/sys/arch/hp300/conf/DISKLESS
index 24cd82c4969..48a3d07f338 100644
--- a/sys/arch/hp300/conf/DISKLESS
+++ b/sys/arch/hp300/conf/DISKLESS
@@ -1,87 +1,92 @@
-# $OpenBSD: DISKLESS,v 1.8 1997/01/12 15:12:13 downsj Exp $
-# $NetBSD: DISKLESS,v 1.11 1996/12/11 09:10:38 thorpej Exp $
+# $OpenBSD: DISKLESS,v 1.9 1997/02/03 04:47:05 downsj Exp $
+# $NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
#
-# Diskless HP 9000/300-series workstation.
+# Generic kernel - one size fits all.
#
-machine "hp300"
-
-cpu "HP320"
-cpu "HP330" # includes 318, 319
-cpu "HP340"
-cpu "HP350"
-cpu "HP360"
-cpu "HP370"
-cpu "HP375" # includes 345, 400t, 400s
-cpu "HP380" # includes 425t, 425s, 433s
-ident DISKLESS
+
+# Include attributes common to all hp300s
+include "arch/hp300/conf/std.hp300"
+
+# Include all GENERIC option
+include "../../../conf/GENERIC"
+
+# Support for various CPU types
+option HP320
+option HP330 # includes 318, 319
+option HP340
+option HP350
+option HP360
+option HP370
+option HP375 # includes 345, 400t, 400s
+option HP380 # includes 425t, 425s, 433s
# Need to set locally
-timezone 8 dst
maxusers 8
-# Standard system options
-options SWAPPAGER # swap pager (anonymous and swap space)
-options DEVPAGER # device pager (mapped devices)
-options "COMPAT_43" # compatibility with 4.3BSD interfaces
-options "COMPAT_44" # compatibility with 4.4BSD binaries
-options "COMPAT_09" # compatibility with NetBSD 0.9
-options "COMPAT_10" # compatibility with NetBSD 1.0
-options COMPAT_M68K4K # NetBSD compatibility
-options SYSVSHM # System V-style shared memory
-options SYSVSEM # System V-style semaphores
-options SYSVMSG # System V-style message queues
-options KTRACE # system call tracing support
-options "NKMEMCLUSTERS=1024" # # 4K pages in kernel malloc pool
-
-# Filesystem options
-options FIFO # POSIX fifo support (in all filesystems)
-options NFSCLIENT # Network filesystem client
-options UNION # Union filesystem (req. for FDESC)
-options KERNFS # kernel data-structure filesystem
-options FDESC # user file descriptor filesystem
-options PROCFS # /proc filesystem
-options MFS # Memory-based filesystem
-
-# Networking options
-options INET # Internet protocols
-#options "TCP_COMPAT_42" # compatibility with 4.2BSD TCP/IP
-options NMBCLUSTERS="512" # Just a little extra
-
# Options for HP hardware
-options FPSP # floating point interface for 68040
-options USELEDS # make the lights twinkle
-#options PANICBUTTON # two fast <reset>s on HIL dump kernel
-options UK_KEYBOARD # include United Kingdom HIL keymap
-options SE_KEYBOARD # include Swedish HIL keymap
+option FPSP # floating point interface for 68040
+option USELEDS # make the lights twinkle
+option COMPAT_NOLABEL # defaults for unlabeled disks
+#option PANICBUTTON # two fast <reset>s on HIL dump kernel
+#option CONSCODE="9" # force console at this select code
+option UK_KEYBOARD # include United Kingdom HIL keymap
+option SE_KEYBOARD # include Swedish HIL keymap
+
+# This option enables a different copyin/copyout that uses page
+# mapping for large copies.
+#option MAPPEDCOPY # different copyin/copyout for large copies
#
# HP-UX binary compatibility.
# NOTE: THIS IS STILL VERY EXPERIMENTAL. YOUR MILEAGE MAY VARY.
#
-options COMPAT_HPUX # HP-UX binary compatibility
+option COMPAT_HPUX # HP-UX binary compatibility
+
+option COMPAT_M68K4K # compat. with NetBSD/m68k4k binaries
+
+# Verbose descriptions of unconfigured DIO devices
+# (Warning: this compiles in a large string table)
+option DIOVERBOSE # recognize "unknown" DIO devices
+
+config bsd swap generic
+
+mainbus0 at root # root "bus"
+
+intio0 at mainbus0 # internal i/o space
+dio0 at mainbus0 # DIO/DIO-II bus
+
+# Davinci framebuffer
+dvbox* at intio?
+dvbox* at dio? scode ?
+
+# Gatorbox framebuffer
+gbox* at intio?
+gbox* at dio? scode ?
-#options "COMPAT_M68K4K" # compat. with NetBSD/m68k4k binaries
+# Hyperion framebuffer
+hyper* at dio? scode ?
-# Debugging options
-options DDB # Kernel Dynamic Debugger
+# Renaissance framebuffer
+rbox* at intio?
+rbox* at dio? scode ?
-config bsd swap nfs
+# Topcat/catseye framebuffers
+topcat* at intio?
+topcat* at dio? scode ?
-device dca0 at scode9 flags 1
-device dca1 at scode? flags 1
+# Framebuffer abstraction
+grf* at dvbox?
+grf* at gbox?
+grf* at hyper?
+grf* at rbox?
+grf* at topcat?
-device dcm0 at scode? flags 0xe
-device dcm1 at scode? flags 0xe
+# Internal Terminal Emulator
+ite* at grf?
-device le0 at scode?
-device le1 at scode?
+dca0 at dio? scode 9 flags 1 # DCA serial interfaces
+dca* at dio? scode ?
-device grf0 at scode?
-device grf1 at scode?
+dcm* at dio? scode ? flags 0xe # DCM 4- or 8-port serial interfaces
-pseudo-device pty 64 # pseudo ptys
-pseudo-device bpfilter 16 # Berkeley packet filter
-pseudo-device vnd 4 # vnode pseudo-disks
-pseudo-device ite # terminal emulation on grf
-pseudo-device loop # loopback network interface
-pseudo-device ether # basic ethernet support
+le* at dio? scode ? # LANCE ethernet interfaces
diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC
index 0b027d5ccbd..d44f37380d6 100644
--- a/sys/arch/hp300/conf/GENERIC
+++ b/sys/arch/hp300/conf/GENERIC
@@ -1,131 +1,112 @@
-# $OpenBSD: GENERIC,v 1.11 1997/01/18 08:16:56 downsj Exp $
-# $NetBSD: GENERIC,v 1.16 1996/12/11 09:10:40 thorpej Exp $
+# $OpenBSD: GENERIC,v 1.12 1997/02/03 04:47:05 downsj Exp $
+# $NetBSD: GENERIC,v 1.23 1997/01/31 06:12:57 thorpej Exp $
#
# Generic kernel - one size fits all.
#
-machine "hp300"
-
-cpu "HP320"
-cpu "HP330" # includes 318, 319
-cpu "HP340"
-cpu "HP350"
-cpu "HP360"
-cpu "HP370"
-cpu "HP375" # includes 345, 400t, 400s
-cpu "HP380" # includes 425t, 425s, 433s
-ident GENERIC
+
+# Include attributes common to all hp300s
+include "arch/hp300/conf/std.hp300"
+
+# Include all GENERIC option
+include "../../../conf/GENERIC"
+
+# Support for various CPU types
+option HP320
+option HP330 # includes 318, 319
+option HP340
+option HP350
+option HP360
+option HP370
+option HP375 # includes 345, 400t, 400s
+option HP380 # includes 425t, 425s, 433s
# Need to set locally
-timezone 8 dst
maxusers 32
-# Standard system options
-options SWAPPAGER # swap pager (anonymous and swap space)
-options DEVPAGER # device pager (mapped devices)
-options "COMPAT_43" # compatibility with 4.3BSD interfaces
-options "COMPAT_44" # compatibility with 4.4BSD binaries
-options "COMPAT_09" # compatibility with NetBSD 0.9
-options "COMPAT_10" # compatibility with NetBSD 1.0
-options COMPAT_M68K4K # NetBSD compatibility
-options SYSVSHM # System V-style shared memory
-options SYSVSEM # System V-style semaphores
-options SYSVMSG # System V-style message queues
-options KTRACE # system call tracing support
-options "NKMEMCLUSTERS=1024" # 4K pages in kernel malloc pool
-
-# Filesystem options
-options FIFO # POSIX fifo support (in all filesystems)
-options FFS,QUOTA # fast filesystem with user and group quotas
-options "CD9660" # CD-ROM ISO-9660 filesystem
-options NFSSERVER # Network filesystem server
-options NFSCLIENT # Network filesystem client
-options UNION # Union filesystem (req. for FDESC)
-options KERNFS # kernel data-structure filesystem
-options FDESC # user file descriptor filesystem
-options PROCFS # /proc filesystem
-options PORTAL # create sockets with open(2)
-options UMAPFS # NULLFS + uid and gid remapping
-options NULLFS # loopback file system
-options MFS # Memory-based filesystem
-
-# Networking options
-options INET # Internet protocols
-#options GATEWAY # IP forwarding + larger mb_map
-options MROUTING # Multicast routing
-options IPFILTER # IP packet filter for security
-#options "TCP_COMPAT_42" # compatibility with 4.2BSD TCP/IP
-
# Options for HP hardware
-options FPSP # floating point interface for 68040
-options USELEDS # make the lights twinkle
-options COMPAT_NOLABEL # defaults for unlabeled disks
-#options PANICBUTTON # two fast <reset>s on HIL dump kernel
-#options CONSCODE="9" # force console at this select code
-options UK_KEYBOARD # include United Kingdom HIL keymap
-options SE_KEYBOARD # include Swedish HIL keymap
+option FPSP # floating point interface for 68040
+option USELEDS # make the lights twinkle
+option COMPAT_NOLABEL # defaults for unlabeled disks
+#option PANICBUTTON # two fast <reset>s on HIL dump kernel
+#option CONSCODE="9" # force console at this select code
+option UK_KEYBOARD # include United Kingdom HIL keymap
+option SE_KEYBOARD # include Swedish HIL keymap
+
+# This option enables a different copyin/copyout that uses page
+# mapping for large copies.
+#option MAPPEDCOPY # different copyin/copyout for large copies
#
# HP-UX binary compatibility.
# NOTE: THIS IS STILL VERY EXPERIMENTAL. YOUR MILEAGE MAY VARY.
#
-options COMPAT_HPUX # HP-UX binary compatibility
+option COMPAT_HPUX # HP-UX binary compatibility
+
+option COMPAT_M68K4K # compat. with NetBSD/m68k4k binaries
-# Debugging options
-options DDB # Kernel Dynamic Debugger
+# Verbose descriptions of unconfigured DIO devices
+# (Warning: this compiles in a large string table)
+option DIOVERBOSE # recognize "unknown" DIO devices
config bsd swap generic
-master hpib0 at scode7
-master hpib1 at scode?
-master hpib2 at scode?
-master hpib3 at scode?
-disk rd0 at hpib? slave ?
-disk rd1 at hpib? slave ?
-disk rd2 at hpib? slave ?
-disk rd3 at hpib? slave ?
-disk rd4 at hpib? slave ?
-disk rd5 at hpib? slave ?
-disk rd6 at hpib? slave ?
-tape ct0 at hpib0 slave ?
-tape ct1 at hpib0 slave ? flags 1
-tape mt0 at hpib0 slave ?
-device ppi0 at hpib0 slave 5
-
-master scsi0 at scode?
-master scsi1 at scode?
-master scsi2 at scode?
-master scsi3 at scode?
-disk sd0 at scsi? slave ?
-disk sd1 at scsi? slave ?
-disk sd2 at scsi? slave ?
-disk sd3 at scsi? slave ?
-disk sd4 at scsi? slave ?
-disk sd5 at scsi? slave ?
-disk sd6 at scsi? slave ?
-disk sd7 at scsi? slave ?
-disk sd8 at scsi? slave ?
-disk sd9 at scsi? slave ?
-tape st0 at scsi? slave ?
-tape st1 at scsi? slave ?
-
-device dca0 at scode9 flags 1
-device dca1 at scode?
-
-device dcm0 at scode? flags 0xe
-device dcm1 at scode? flags 0xe
-
-device le0 at scode?
-device le1 at scode?
-
-device grf0 at scode?
-device grf1 at scode?
-
-pseudo-device pty 64 # pseudo ptys
-pseudo-device sl 4 # SLIP network interfaces
-pseudo-device ppp 4 # PPP network interfaces
-pseudo-device bpfilter 16 # Berkeley packet filter
-pseudo-device vnd 4 # vnode pseudo-disks
-pseudo-device ccd 4 # concatenated disk devices
-pseudo-device ite # terminal emulation on grf
-pseudo-device loop # loopback network interface
-pseudo-device ether # basic ethernet support
+mainbus0 at root # root "bus"
+
+intio0 at mainbus0 # internal i/o space
+dio0 at mainbus0 # DIO/DIO-II bus
+
+# Davinci framebuffer
+dvbox* at intio?
+dvbox* at dio? scode ?
+
+# Gatorbox framebuffer
+gbox* at intio?
+gbox* at dio? scode ?
+
+# Hyperion framebuffer
+hyper* at dio? scode ?
+
+# Renaissance framebuffer
+rbox* at intio?
+rbox* at dio? scode ?
+
+# Topcat/catseye framebuffers
+topcat* at intio?
+topcat* at dio? scode ?
+
+# Framebuffer abstraction
+grf* at dvbox?
+grf* at gbox?
+grf* at hyper?
+grf* at rbox?
+grf* at topcat?
+
+# Internal Terminal Emulator
+ite* at grf?
+
+dca0 at dio? scode 9 flags 1 # DCA serial interfaces
+dca* at dio? scode ?
+
+dcm* at dio? scode ? flags 0xe # DCM 4- or 8-port serial interfaces
+
+le* at dio? scode ? # LANCE ethernet interfaces
+
+nhpib0 at dio? scode 7 # slow internal HP-IB
+nhpib* at dio? scode ?
+
+fhpib* at dio? scode ? # `fast' HP-IB
+
+hpibbus0 at nhpib0
+hpibbus* at nhpib?
+hpibbus* at fhpib?
+
+rd* at hpibbus? slave ? punit ? # HP-IB disks
+ct* at hpibbus? slave ? punit ? # HP-IB cartridge tapes
+mt* at hpibbus? slave ? punit ? # HP-IB 9-track tape
+ppi0 at hpibbus0 slave 5 punit 0 # HP-IB plotter
+
+oscsi* at dio? scode ? # Old HP SCSI
+
+sd* at oscsi? target ? lun ? # SCSI disks
+st* at oscsi? target ? lun ? # SCSI tapes
+ac* at oscsi? target ? lun ? # SCSI changers
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index 1db970d958e..c85387065b7 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hp300,v 1.11 1997/01/18 15:30:10 niklas Exp $
+# $OpenBSD: Makefile.hp300,v 1.12 1997/02/03 04:47:06 downsj Exp $
# $NetBSD: Makefile.hp300,v 1.45 1996/12/01 06:12:30 jonathan Exp $
# Makefile for OpenBSD
@@ -122,7 +122,7 @@ param.o: param.c Makefile
ioconf.o: ioconf.c
${NORMAL_C}
-vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
+newvers: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP}
sh $S/conf/newvers.sh
${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c vers.c
diff --git a/sys/arch/hp300/conf/NEWCONFIG b/sys/arch/hp300/conf/NEWCONFIG
deleted file mode 100644
index 7c0344eea65..00000000000
--- a/sys/arch/hp300/conf/NEWCONFIG
+++ /dev/null
@@ -1,148 +0,0 @@
-# $OpenBSD: NEWCONFIG,v 1.1 1997/01/12 15:12:14 downsj Exp $
-# $NetBSD: NEWCONFIG,v 1.1 1996/12/17 08:40:56 thorpej Exp $
-#
-# "Generic" kernel for new-style config.
-#
-
-# Include attributes common to all hp300s
-include "arch/hp300/conf/std.hp300"
-
-# Support for various CPU types
-options HP320
-options HP330 # includes 318, 319
-options HP340
-options HP350
-options HP360
-options HP370
-options HP375 # includes 345, 400t, 400s
-options HP380 # includes 425t, 425s, 433s
-
-# Need to set locally
-maxusers 32
-
-# Standard system options
-options COMPAT_43 # compatibility with 4.3BSD interfaces
-options COMPAT_44 # compatibility with 4.4BSD binaries
-options COMPAT_09 # compatibility with NetBSD 0.9
-options COMPAT_10 # compatibility with NetBSD 1.0
-options COMPAT_11 # compatibility with NetBSD 1.1
-options COMPAT_12 # compatibility with NetBSD 1.2
-options SYSVSHM # System V-style shared memory
-options SYSVSEM # System V-style semaphores
-options SYSVMSG # System V-style message queues
-options KTRACE # system call tracing support
-options "NKMEMCLUSTERS=1024" # # 4K pages in kernel malloc pool
-
-# Filesystem options
-options FIFO # POSIX fifo support (in all filesystems)
-options FFS,QUOTA # fast filesystem with user and group quotas
-options CD9660 # CD-ROM ISO-9660 filesystem
-options NFSSERVER # Network filesystem server
-options NFSCLIENT # Network filesystem client
-options UNION # Union filesystem (req. for FDESC)
-options KERNFS # kernel data-structure filesystem
-options FDESC # user file descriptor filesystem
-options PROCFS # /proc filesystem
-options MFS # Memory-based filesystem
-
-# Networking options
-options INET # Internet protocols
-options GATEWAY # IP forwarding + larger mb_map
-options MROUTING # Multicast routing
-options TCP_COMPAT_42 # compatibility with 4.2BSD TCP/IP
-
-# Options for HP hardware
-options FPSP # floating point interface for 68040
-options USELEDS # make the lights twinkle
-options COMPAT_NOLABEL # defaults for unlabeled disks
-#options PANICBUTTON # two fast <reset>s on HIL dump kernel
-#options CONSCODE="9" # force console at this select code
-options UK_KEYBOARD # include United Kingdom HIL keymap
-options SE_KEYBOARD # include Swedish HIL keymap
-
-# This option enables a different copyin/copyout that uses page
-# mapping for large copies.
-#options MAPPEDCOPY # different copyin/copyout for large copies
-
-#
-# HP-UX binary compatibility.
-# NOTE: THIS IS STILL VERY EXPERIMENTAL. YOUR MILEAGE MAY VARY.
-#
-options COMPAT_HPUX # HP-UX binary compatibility
-
-options COMPAT_M68K4K # compat. with NetBSD/m68k4k binaries
-
-# Debugging options
-options DIAGNOSTIC # Extra kernel sanity checks
-#options DEBUG # Enable misc. kernel debugging code
-options DDB # Kernel Dynamic Debugger
-
-config netbsd swap generic
-
-mainbus0 at root # root "bus"
-
-intio0 at mainbus0 # internal i/o space
-dio0 at mainbus0 # DIO/DIO-II bus
-
-# Davinci framebuffer
-dvbox* at intio?
-dvbox* at dio? scode ?
-
-# Gatorbox framebuffer
-gbox* at intio?
-gbox* at dio? scode ?
-
-# Hyperion framebuffer
-hyper* at dio? scode ?
-
-# Renaissance framebuffer
-rbox* at intio?
-rbox* at dio? scode ?
-
-# Topcat/catseye framebuffers
-topcat* at intio?
-topcat* at dio? scode ?
-
-# Framebuffer abstraction
-grf* at dvbox?
-grf* at gbox?
-grf* at hyper?
-grf* at rbox?
-grf* at topcat?
-
-# Internal Terminal Emulator
-ite* at grf?
-
-dca0 at dio? scode 9 flags 1 # DCA serial interfaces
-dca* at dio? scode ?
-
-dcm* at dio? scode ? flags 0xe # DCM 4- or 8-port serial interfaces
-
-le* at dio? scode ? # LANCE ethernet interfaces
-
-#nhpib0 at dio? scode 7 # slow internal HP-IB
-#nhpib* at dio? scode ?
-
-#fhpib* at dio? scode ? # `fast' HP-IB
-
-#hpibbus* at nhpib?
-#hpibbus* at fhpib?
-
-#rd* at hpibbus? slave ? punit ? # HP-IB disks
-#ct* at hpibbus? slave ? punit ? # HP-IB cartridge tapes
-#mt* at hpibbus? slave ? punit ? # HP-IB 9-track tape
-#ppi0 at hpibbus0 slave 5 punit 0 # HP-IB plotter
-
-#oscsi* at dio? scode ? # Old HP SCSI
-
-#sd* at oscsi? target ? lun ? # SCSI disks
-#st* at oscsi? target ? lun ? # SCSI tapes
-#ac* at oscsi? target ? lun ? # SCSI changers
-
-pseudo-device pty 64 # pseudo ptys
-pseudo-device sl 4 # SLIP network interfaces
-pseudo-device ppp 4 # PPP network interfaces
-pseudo-device bpfilter 16 # Berkeley packet filter
-pseudo-device vnd 4 # vnode pseudo-disks
-pseudo-device ccd 4 # concatenated disk devices
-pseudo-device loop # loopback network interface
diff --git a/sys/arch/hp300/conf/devices.hp300.oldconf b/sys/arch/hp300/conf/devices.hp300.oldconf
deleted file mode 100644
index 3a88c8b5f4a..00000000000
--- a/sys/arch/hp300/conf/devices.hp300.oldconf
+++ /dev/null
@@ -1,6 +0,0 @@
-ct 0
-mt 1
-rd 2
-sd 4
-ccd 5
-vnd 6
diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300
index 0c00099075e..8673bf16eb9 100644
--- a/sys/arch/hp300/conf/files.hp300
+++ b/sys/arch/hp300/conf/files.hp300
@@ -1,5 +1,5 @@
-# $OpenBSD: files.hp300,v 1.1 1997/01/12 15:12:15 downsj Exp $
-# $NetBSD: files.hp300,v 1.20 1996/12/17 08:40:57 thorpej Exp $
+# $OpenBSD: files.hp300,v 1.2 1997/02/03 04:47:08 downsj Exp $
+# $NetBSD: files.hp300,v 1.22 1997/01/30 22:11:19 scottr Exp $
#
# hp300-specific configuration info
@@ -112,15 +112,18 @@ file arch/hp300/dev/hpib.c hpibbus
device ct: tape
attach ct at hpibbus
file arch/hp300/dev/ct.c ct needs-flag
+major {ct = 0}
device mt: tape
attach mt at hpibbus
file arch/hp300/dev/mt.c mt needs-flag
+major {mt = 1}
device rd: disk
attach rd at hpibbus
file arch/hp300/dev/rd.c rd needs-flag
file arch/hp300/dev/rd_compat.c rd # XXX
+major {rd = 2}
device ppi
attach ppi at hpibbus
@@ -129,13 +132,14 @@ file arch/hp300/dev/ppi.c ppi needs-flag
# Old HP SCSI layer
device oscsi { target = -1, lun = -1 }
attach oscsi at dio
-file arch/hp300/dev/scsi.c scsi
+file arch/hp300/dev/scsi.c oscsi
# Old HP SCSI devices
device sd: disk
attach sd at oscsi
file arch/hp300/dev/sd.c sd needs-flag
file arch/hp300/dev/sd_compat.c sd # XXX
+major {sd = 4}
device st: tape
attach st at oscsi
@@ -179,6 +183,8 @@ file dev/cninit.c
file kludge_for_in_proto.c hy needs-flag
+major {vnd = 6}
+
#
# HP-UX binary compatibility
#
diff --git a/sys/arch/hp300/conf/files.hp300.oldconf b/sys/arch/hp300/conf/files.hp300.oldconf
deleted file mode 100644
index 78e592c6f3e..00000000000
--- a/sys/arch/hp300/conf/files.hp300.oldconf
+++ /dev/null
@@ -1,75 +0,0 @@
-# $OpenBSD: files.hp300.oldconf,v 1.6 1997/01/12 15:12:15 downsj Exp $
-# $NetBSD: files.hp300.oldconf,v 1.30 1997/01/05 04:41:48 thorpej Exp $
-#
-arch/hp300/hp300/autoconf.c standard
-arch/hp300/hp300/clock.c standard
-arch/hp300/hp300/conf.c standard
-arch/hp300/hp300/db_memrw.c optional ddb
-arch/hp300/hp300/dkbad.c standard
-arch/hp300/hp300/kgdb_glue.c optional kgdb compile-with "${NORMAL_C} -fno-defer-pop"
-arch/hp300/hp300/kgdb_stub.c optional kgdb
-arch/hp300/hp300/machdep.c standard
-arch/hp300/hp300/isr.c standard
-arch/hp300/hp300/mem.c standard
-arch/hp300/hp300/pmap.c standard
-arch/hp300/hp300/pmap_bootstrap.c standard
-arch/hp300/hp300/sys_machdep.c standard
-arch/hp300/hp300/trap.c standard
-arch/hp300/hp300/vm_machdep.c standard
-arch/hp300/hp300/disksubr.c standard
-arch/hp300/dev/dio.c standard
-arch/hp300/dev/grf_conf.c optional grf
-arch/hp300/dev/grf_dv.c optional grf needs-count # XXX? d-d?
-arch/hp300/dev/grf_gb.c optional grf needs-count # XXX? d-d?
-arch/hp300/dev/grf_hy.c optional grf needs-count # XXX? d-d?
-arch/hp300/dev/grf_machdep.c optional grf
-arch/hp300/dev/grf_rb.c optional grf needs-count # XXX? d-d?
-arch/hp300/dev/grf_tc.c optional grf needs-count # XXX? d-d?
-arch/hp300/dev/dcm.c optional dcm device-driver
-arch/hp300/dev/if_le.c optional le device-driver
-dev/ic/am7990.c optional le device-driver
-arch/hp300/dev/dma.c standard
-arch/hp300/dev/hpib.c optional hpib
-arch/hp300/dev/fhpib.c optional hpib device-driver
-arch/hp300/dev/nhpib.c optional hpib device-driver
-arch/hp300/dev/ct.c optional ct needs-count # XXX? d-d?
-arch/hp300/dev/mt.c optional mt needs-count # XXX? d-d?
-arch/hp300/dev/ppi.c optional ppi device-driver
-arch/hp300/dev/rd.c optional rd needs-count # XXX? d-d?
-arch/hp300/dev/rd_compat.c optional rd compat_nolabel
-arch/hp300/dev/scsi.c optional scsi device-driver
-arch/hp300/dev/ac.c optional ac needs-count # XXX? d-d?
-arch/hp300/dev/sd.c optional sd needs-count # XXX? d-d?
-arch/hp300/dev/sd_compat.c optional sd compat_nolabel
-arch/hp300/dev/st.c optional st needs-count # XXX? d-d?
-arch/hp300/dev/dca.c optional dca device-driver
-arch/hp300/dev/grf.c optional grf needs-count # XXX? d-d?
-arch/hp300/dev/hil.c standard
-arch/hp300/dev/hil_keymaps.c standard
-arch/hp300/dev/ite.c optional ite needs-count # XXX? d-d?
-arch/hp300/dev/ite_subr.c optional ite needs-count # XXX? d-d?
-arch/m68k/m68k/copy.s standard
-dev/cons.c standard
-dev/cninit.c standard
-thisisfor_in_proto.c optional hy
-
-#
-# Compatibility modules
-#
-
-# HPUX Binary Compatibility (COMPAT_HPUX)
-# XXX: Cannot use an include directive yet. When the upgrade to the
-# new config is complete, the include line should be uncommented
-# and the others should be removed
-#
-# include "../../../compat/hpux/files.hpux"
-
-compat/hpux/hpux_compat.c optional compat_hpux
-compat/hpux/hpux_file.c optional compat_hpux
-compat/hpux/hpux_exec.c optional compat_hpux
-compat/hpux/hpux_net.c optional compat_hpux
-compat/hpux/hpux_sig.c optional compat_hpux
-compat/hpux/hpux_syscalls.c optional compat_hpux
-compat/hpux/hpux_sysent.c optional compat_hpux
-compat/hpux/hpux_tty.c optional compat_hpux
-arch/hp300/hp300/hpux_machdep.c optional compat_hpux
diff --git a/sys/arch/hp300/conf/std.hp300 b/sys/arch/hp300/conf/std.hp300
index 144419845ef..cacfbba6f57 100644
--- a/sys/arch/hp300/conf/std.hp300
+++ b/sys/arch/hp300/conf/std.hp300
@@ -1,17 +1,11 @@
-# $OpenBSD: std.hp300,v 1.1 1997/01/12 15:12:16 downsj Exp $
-# $NetBSD: std.hp300,v 1.1 1996/12/17 08:40:58 thorpej Exp $
+# $OpenBSD: std.hp300,v 1.2 1997/02/03 04:47:09 downsj Exp $
+# $NetBSD: std.hp300,v 1.2 1997/01/30 09:55:45 thorpej Exp $
#
# Options/devices that all hp300s should have
#
machine hp300 m68k
-# XXX new config glue, for now
-options NEWCONFIG
-
-options SWAPPAGER # swap pager (anonymous and swap space)
-options VNODEPAGER # vnode pager (mapped files)
-options DEVPAGER # device pager (mapped devices)
-
-options EXEC_AOUT # support for exec'ing a.out
-options EXEC_SCRIPT # support for #! scripts
+#option SWAPPAGER # swap pager (anonymous and swap space)
+#option VNODEPAGER # vnode pager (mapped files)
+#option DEVPAGER # device pager (mapped devices)