Fix the PICOBSD kernel configs. They're now converted to use

Peter's new format, and I'd added hints files for each.

The build process uses the PICOBSD.hints file as well as the config,
and additionally builds with -DNO_MODULES.  The build process
probably needs to be converted to use the 'buildkernel' method
instead of running config itself.

The kernels now compile.  I've not been able to test the crunch
process however because it used the vn driver and there are no
/dev/vn device nodes under devfs yet.  Maybe someone else could
give it a go.

13 files changed, 533 insertions, 287 deletions

diff --git a/release/picobsd/bridge/PICOBSD b/release/picobsd/bridge/PICOBSD
index b2dcd4c..44206a5 100644
--- a/release/picobsd/bridge/PICOBSD
+++ b/release/picobsd/bridge/PICOBSD
@@ -13,88 +13,99 @@ cpu		I686_CPU
 ident		PICOBSD
 maxusers	20
 
-options		MATH_EMULATE		#Support for x87 emulation
-options		INET			#InterNETworking
-options		FFS			#Berkeley Fast Filesystem
-options		FFS_ROOT		#FFS usable as root device [keep this!]
-#options		NFS			#Network Filesystem
-options		NFS_NOSERVER		#Network Filesystem
-#options		BOOTP
-options		MFS			#Memory Filesystem
-options		MD_ROOT		#MFS as root
-options		MSDOSFS			#MSDOS Filesystem
-#options		CD9660		#ISO 9660 Filesystem
-options		PROCFS			#Process filesystem
-options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options		USERCONFIG		#boot -c editor
-#options		INTRO_USERCONFIG		#imply -c and parse info area
-options		VISUAL_USERCONFIG	#visual boot -c editor
+options 	MATH_EMULATE		#Support for x87 emulation
+options 	INET			#InterNETworking
+options 	FFS			#Berkeley Fast Filesystem
+options 	FFS_ROOT		#FFS usable as root device [keep this!]
+options 	MFS			#Memory Filesystem
+#options 	DEVFS			#Device Filesystem
+options 	MD_ROOT			#MD is a potential root device
+#options 	NFS			#Network Filesystem
+#options 	NFS_ROOT		#NFS usable as root device, NFS required
+options		NFS_NOSERVER		#Disable the NFS-server code.
+#options		BOOTP			#Use BOOTP to obtain IP address/hostname
+options 	MSDOSFS			#MSDOS Filesystem
+#options 	CD9660			#ISO 9660 Filesystem
+#options 	CD9660_ROOT		#CD-ROM usable as root, CD9660 required
+options 	PROCFS			#Process filesystem
+options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
+#options 	UCONSOLE		#Allow users to grab the console
+options 	USERCONFIG		#boot -c editor
+#options		INTRO_USERCONFIG	#imply -c and parse info area
+
+options 	VISUAL_USERCONFIG	#visual boot -c editor
+#options 	KTRACE			#ktrace(1) support
+#options 	SYSVSHM			#SYSV-style shared memory
+#options 	SYSVMSG			#SYSV-style message queues
+#options 	SYSVSEM			#SYSV-style semaphores
+#options 	P1003_1B		#Posix P1003_1B real-time extensions
+#options 	_KPOSIX_PRIORITY_SCHEDULING
+#options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 options		IPFIREWALL
 options		IPFIREWALL_DEFAULT_TO_ACCEPT
 options		IPDIVERT
-#options		DEVFS
-options		PCI_QUIET
-options         COMPAT_OLDISA   #Use ISA shims and glue for old drivers
-options         COMPAT_OLDPCI   #Use PCI shims and glue for old drivers
-#options		NO_LKM
+options		PCI_QUIET		#quiets PCI code on chipset settings
+
 # Support for bridging and bandwidth limiting
-options	DUMMYNET
-options	BRIDGE
-options	HZ=1000
-options NMBCLUSTERS=4096
-pseudo-device bpf 4
+options		DUMMYNET
+options		BRIDGE
+options		HZ=1000
+options		NMBCLUSTERS=4096
 
-#config		kernel	root on fd0a
+device		isa
+device		pci
+options 	COMPAT_OLDISA		# compatability shims for lnc, le
+options 	COMPAT_OLDPCI		# compatability shims for lnc, vx
 
-device	isa0
-device	pci0
+# Floppy drives
+device		fdc
 
-device		fdc0	at isa? port IO_FD1 irq 6 drq 2
-device		fd0	at fdc0 drive 0
-#device		fd1	at fdc0 drive 1
+# ATA and ATAPI devices
+device		ata
+device		atadisk			# ATA disk drives
+#device		atapicd			# ATAPI CDROM drives
 
-device ata0	at isa? port IO_WD1 irq 14
-device ata1	at isa? port IO_WD2 irq 15
-device ata
-device atadisk
-#device	atapicd
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device	atkbdc0	at isa? port IO_KBD
-device		atkbd0	at atkbdc? irq 1
-device          psm0    at atkbdc? irq 12
+device		atkbdc	1
+device		atkbd
+device		psm
 
-device		vga0	at isa?
+device		vga
 
 # syscons is the default console driver, resembling an SCO console
-device		sc0	at isa?
+device		sc	1
 
-device		npx0	at nexus? port IO_NPX irq 13
+# Floating point support - do not disable.
+device		npx
 
-device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
-device		sio1	at isa? port IO_COM2 irq 3
+# Serial (COM) ports
+device		sio
 
-# device ppc0	at isa? port? flags 0x40 irq 7
-# device	ppbus0
-# device		nlpt0	at ppbus?
-# device		plip0	at ppbus?
-# device		ppi0	at ppbus?
+# Parallel port
+#device		ppc
+#device		ppbus		# Parallel port bus (required)
+#device		lpt		# Printer
+#device		plip		# TCP/IP over parallel
+#device		ppi		# Parallel port interface device
 
 #
 # The following Ethernet NICs are all PCI devices.
 #
 device	miibus 
-#device de0              # DEC/Intel DC21x4x (``Tulip'')
-device fxp0             # Intel EtherExpress PRO/100B (82557, 82558)
-device rl0
-device dc0
-
-device ed0 at isa? port 0x280 irq 5 iomem 0xd8000
-device ed1 at isa? port 0x300 irq 5 iomem 0xd0000
-
-pseudo-device	loop
-pseudo-device	ether
-pseudo-device	tun	2
-pseudo-device	vn
-pseudo-device	pty	16
-pseudo-device	md
+#device		de		# DEC/Intel DC21x4x (``Tulip'')
+device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
+device		rl		# RealTek 8129/8139
+device		dc		# DEC/Intel 21143 and various workalikes
+device		ed
+
+device		loop		# Network loopback
+device		ether		# Ethernet support
+device		tun		# Packet tunnel.
+device		vn		#Vnode driver (turns a file into a device)
+device		pty		# Pseudo-ttys (telnet etc)
+device		md		# Memory "disks"
+
+# The `bpf' device enables the Berkeley Packet Filter.
+# Be aware of the administrative consequences of enabling this!
+device		bpf		# Berkeley packet filter
diff --git a/release/picobsd/bridge/PICOBSD.hints b/release/picobsd/bridge/PICOBSD.hints
new file mode 100644
index 0000000..580dd1a
--- /dev/null
+++ b/release/picobsd/bridge/PICOBSD.hints
@@ -0,0 +1,39 @@
+# $FreeBSD$
+hint.fdc.0.at="isa"
+hint.fdc.0.port="0x3F0"
+hint.fdc.0.irq="6"
+hint.fdc.0.drq="2"
+hint.fd.0.at="fdc0"
+hint.fd.0.drive="0"
+hint.ata.0.at="isa"
+hint.ata.0.port="0x1F0"
+hint.ata.0.irq="14"
+hint.ata.1.at="isa"
+hint.ata.1.port="0x170"
+hint.ata.1.irq="15"
+hint.atkbdc.0.at="isa"
+hint.atkbdc.0.port="0x060"
+hint.atkbd.0.at="atkbdc"
+hint.atkbd.0.irq="1"
+hint.psm.0.at="atkbdc"
+hint.psm.0.irq="12"
+hint.vga.0.at="isa"
+hint.sc.0.at="isa"
+hint.npx.0.at="nexus"
+hint.npx.0.port="0x0F0"
+hint.npx.0.irq="13"
+hint.sio.0.at="isa"
+hint.sio.0.port="0x3F8"
+hint.sio.0.flags="0x10"
+hint.sio.0.irq="4"
+hint.sio.1.at="isa"
+hint.sio.1.port="0x2F8"
+hint.sio.1.irq="3"
+hint.ed.0.at="isa"
+hint.ed.0.port="0x280"
+hint.ed.0.irq="5"
+hint.ed.0.maddr="0xd8000"
+hint.ed.1.at="isa"
+hint.ed.1.port="0x300"
+hint.ed.1.irq="5"
+hint.ed.1.maddr="0xd0000"
diff --git a/release/picobsd/build/Makefile.conf b/release/picobsd/build/Makefile.conf
index 5a82e77..8b11d2b 100644
--- a/release/picobsd/build/Makefile.conf
+++ b/release/picobsd/build/Makefile.conf
@@ -14,13 +14,14 @@ all: $(KERNFILE)
 
 ${CONF}/${CONFFILE}: PICOBSD
 	cp PICOBSD ${CONF}/${CONFFILE}
+	cp PICOBSD.hints ${CONF}/${CONFFILE}.hints
 	(cd ${CONF}; \
 	config ${CONFFILE}; \
 	cd ${COMPILE}; \
-	make depend )
+	make depend -DNO_MODULES)
 
 ${COMPILE}: ${CONF}/${CONFFILE}
 
 $(KERNFILE): ${COMPILE}
-	(cd ${COMPILE}; make )
+	(cd ${COMPILE}; make -DNO_MODULES)
 
diff --git a/release/picobsd/dial/PICOBSD b/release/picobsd/dial/PICOBSD
index 1efe08c..dcb65b8 100644
--- a/release/picobsd/dial/PICOBSD
+++ b/release/picobsd/dial/PICOBSD
@@ -6,8 +6,6 @@
 
 #
 machine		i386
-cpu		I386_CPU
-cpu		I486_CPU
 cpu		I586_CPU
 cpu		I686_CPU
 ident		PICOBSD
@@ -32,58 +30,34 @@ options		NO_SWAPPING
 options         COMPAT_OLDISA   #Use ISA shims and glue for old drivers
 options         COMPAT_OLDPCI   #Use PCI shims and glue for old drivers
 
-device	isa0
-device	pci0
+device		isa
+device		pci
 
-device		fdc0	at isa? port IO_FD1 irq 6 drq 2
-device		fd0	at fdc0 drive 0
-device		fd1	at fdc0 drive 1
-
-device	ata0	at isa? port IO_WD1 irq 14
-device	ata1	at isa? port IO_WD2 irq 15
+device		fdc
+device		ata
 device		atadisk
 device		atapicd
 options		ATA_STATIC_ID		#Static device numbering
 
-# atkbdc0 controlls both the keyboard and the PS/2 mouse
-device	atkbdc0	at isa? port IO_KBD
-device		atkbd0	at atkbdc? irq 1
-device		psm0	at atkbdc? irq 12
+# atkbdc0 controls both the keyboard and the PS/2 mouse
+device          atkbdc  1
+device          atkbd
+device          psm
 
-device		vga0	at isa? port ?
+device		vga
 
 # syscons is the default console driver, resembling an SCO console
-device		sc0	at isa?
-
-device		npx0	at nexus? port IO_NPX irq 13
-
-device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
-device		sio1	at isa? port IO_COM2 irq 3
-device		sio2	at isa? disable port IO_COM3 irq 5
-device		sio3	at isa? disable port IO_COM4 irq 9
-
-
-#
-# The following Ethernet NICs are all PCI devices.
-#
-device de0		# DEC/Intel DC21x4x (``Tulip'')
-#device de1		# DEC/Intel DC21x4x (``Tulip'')
-device fxp0		# Intel EtherExpress PRO/100B (82557, 82558
+device		sc	1
 
-# Order is important here due to intrusive probes, do *not* alphabetize
-# this list of network interfaces until the probes have been fixed.
-# Right now it appears that the ie0 must be probed before ep0. See
-# revision 1.20 of this file.
+# Floating point support - do not disable.
+device		npx
 
-device ed0 at isa? port 0x280 irq 5 iomem 0xd8000
-device ep0 at isa? port 0x300 irq 10
-device ie0 at isa? port 0x300 irq 5 iomem 0xd0000
-device le0 at isa? port 0x300 irq 5 iomem 0xd0000
-device lnc0 at isa? port 0x300 irq 10
+# Serial (COM) ports
+device		sio
 
-pseudo-device	loop
-pseudo-device	ether
-pseudo-device	tun	1
-pseudo-device	pty	16
-pseudo-device	md
-#pseudo-device	gzip		# Exec gzipped a.out's
+device		random		# Entropy device
+device		loop		# Network loopback
+device		ether		# Ethernet support
+device		tun		# Packet tunnel.
+device		pty		# Pseudo-ttys (telnet etc)
+device		md		# Memory "disks"
diff --git a/release/picobsd/dial/PICOBSD.hints b/release/picobsd/dial/PICOBSD.hints
new file mode 100644
index 0000000..1c6c3b2
--- /dev/null
+++ b/release/picobsd/dial/PICOBSD.hints
@@ -0,0 +1,33 @@
+# $FreeBSD$
+hint.fdc.0.at="isa"
+hint.fdc.0.port="0x3F0"
+hint.fdc.0.irq="6"
+hint.fdc.0.drq="2"
+hint.fd.0.at="fdc0"
+hint.fd.0.drive="0"
+hint.fd.1.at="fdc0"
+hint.fd.1.drive="1"
+hint.ata.0.at="isa"
+hint.ata.0.port="0x1F0"
+hint.ata.0.irq="14"
+hint.ata.1.at="isa"
+hint.ata.1.port="0x170"
+hint.ata.1.irq="15"
+hint.atkbdc.0.at="isa"
+hint.atkbdc.0.port="0x060"
+hint.atkbd.0.at="atkbdc"
+hint.atkbd.0.irq="1"
+hint.psm.0.at="atkbdc"
+hint.psm.0.irq="12"
+hint.vga.0.at="isa"
+hint.sc.0.at="isa"
+hint.npx.0.at="nexus"
+hint.npx.0.port="0x0F0"
+hint.npx.0.irq="13"
+hint.sio.0.at="isa"
+hint.sio.0.port="0x3F8"
+hint.sio.0.flags="0x10"
+hint.sio.0.irq="4"
+hint.sio.1.at="isa"
+hint.sio.1.port="0x2F8"
+hint.sio.1.irq="3"
diff --git a/release/picobsd/install/PICOBSD b/release/picobsd/install/PICOBSD
index d8a8b0b..2375728 100644
--- a/release/picobsd/install/PICOBSD
+++ b/release/picobsd/install/PICOBSD
@@ -25,70 +25,51 @@ options		MSDOSFS			#MSDOS Filesystem
 options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
 options		"NO_F00F_HACK"
 
-config		kernel	root on fd0a
+device		isa
+device		pci
 
-controller	isa0
-controller	pci0
+device		fdc
 
-controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2
-device		fd0	at fdc0 drive 0
-#device		fd1	at fdc0 drive 1
-
-options		"CMD640"	# work around CMD640 chip deficiency
-controller	wdc0	at isa? port "IO_WD1" bio irq 14 flags 0xb0ffb0ff
-device		wd0	at wdc0 drive 0
-device		wd1	at wdc0 drive 1
-
-controller	wdc1	at isa? port "IO_WD2" bio irq 15 flags 0xb0ffb0ff
-device		wd2	at wdc1 drive 0
-device		wd3	at wdc1 drive 1
-
-#options		ATAPI		#Enable ATAPI support for IDE bus
-#options		ATAPI_STATIC	#Don't do it as an LKM
-#device		acd0	#IDE CD-ROM
+# ATA and ATAPI devices
+device		ata
+device		atadisk
 
 # syscons is the default console driver, resembling an SCO console
 
-controller	atkbdc0	at isa? port IO_KBD tty
-device		atkbd0	at isa? tty irq 1
-device		vga0	at isa? port ?
-device		sc0	at isa? tty
+device		atkbdc	1
+device		atkbd
+device		vga
+device		sc	1
 
-device		npx0	at isa? port IO_NPX irq 13
+device		npx
 
-device		sio0	at isa? port "IO_COM1" flags 0x10 tty irq 4
-device		sio1	at isa? port "IO_COM2" tty irq 3
-device		sio2	at isa? disable port "IO_COM3" tty irq 5
-device		sio3	at isa? disable port "IO_COM4" tty irq 9
+device		sio
 
-#device		ppc0	at isa? port? net irq 7
-#controller	ppbus0
-#device		nlpt0	at ppbus?
-#device		plip0	at ppbus?       
-#device		ppi0	at ppbus?       
+#device		ppc
+#controller	ppbus
+#device		nlpt
+#device		plip
+#device		ppi
 
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
 # Right now it appears that the ie0 must be probed before ep0. See
 # revision 1.20 of this file.
-device de0
-device fxp0
-
-#device ed0 at isa? port 0x280 net irq 5 iomem 0xd8000
-#device ed1 at isa? port 0x300 net irq 10 iomem 0xd0000
-#device ep0 at isa? port 0x300 net irq 10
-#device ep1 at isa? port 0x280 net irq 5
-#device ie0 at isa? port 0x300 net irq 5 iomem 0xd0000
-#device ie1 at isa? port 0x360 net irq 7 iomem 0xd0000
-
-pseudo-device	loop
-pseudo-device	ether
-# pseudo-device	tun	2
-pseudo-device	vn
-pseudo-device	pty	16
-pseudo-device	md
-#pseudo-device	gzip		# Exec gzipped a.out's
-pseudo-device	bpfilter	4
+device de
+device fxp
+
+#device ed
+#device ep
+#device ie
+
+device	loop
+device	ether
+# device	tun	2
+device	vn
+device	pty	16
+device	md
+#device	gzip		# Exec gzipped a.out's
+device	bpf	4
 options         COMPAT_OLDISA   #Use ISA shims and glue for old drivers
 options         COMPAT_OLDPCI   #Use PCI shims and glue for old drivers
 
diff --git a/release/picobsd/install/PICOBSD.hints b/release/picobsd/install/PICOBSD.hints
new file mode 100644
index 0000000..3301f28
--- /dev/null
+++ b/release/picobsd/install/PICOBSD.hints
@@ -0,0 +1,30 @@
+# $FreeBSD$
+hint.fd.0.at="fdc0"
+hint.fd.0.drive="0"
+hint.ata.0.port="0x1F0"
+hint.ata.0.irq="14"
+hint.ata.1.at="isa"
+hint.ata.1.port="0x170"
+hint.ata.1.irq="15"
+hint.atkbd.0.at="isa"
+hint.atkbd.0.irq="1"
+hint.vga.0.at="isa"
+hint.sc.0.at="isa"
+hint.npx.0.at="isa"
+hint.npx.0.port="0x0F0"
+hint.npx.0.irq="13"
+hint.sio.0.at="isa"
+hint.sio.0.port="0x3F8"
+hint.sio.0.flags="0x10"
+hint.sio.0.irq="4"
+hint.sio.1.at="isa"
+hint.sio.1.port="0x2F8"
+hint.sio.1.irq="3"
+hint.sio.2.at="isa"
+hint.sio.2.disabled="1"
+hint.sio.2.port="0x3E8"
+hint.sio.2.irq="5"
+hint.sio.3.at="isa"
+hint.sio.3.disabled="1"
+hint.sio.3.port="0x2E8"
+hint.sio.3.irq="9"
diff --git a/release/picobsd/isp/PICOBSD b/release/picobsd/isp/PICOBSD
index 88235d4..7f4e3a0 100644
--- a/release/picobsd/isp/PICOBSD
+++ b/release/picobsd/isp/PICOBSD
@@ -40,101 +40,76 @@ options		HZ=1000
 #options	NMBCLUSTERS=4096
 #options	BRIDGE
 
-device	isa0
-device	pci0
+device	isa
+device	pci
 
-device	fdc0	at isa? port IO_FD1 irq 6 drq 2
-device		fd0	at fdc0 drive 0
-#device		fd1	at fdc0 drive 1
+device	fdc
 
-device ata0    at isa? port IO_WD1 irq 14
-device ata1    at isa? port IO_WD2 irq 15
-device ata
-device atadisk
-device atapicd
+device	ata
+device	atadisk
+device	atapicd
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device	atkbdc0	at isa? port IO_KBD
-device		atkbd0	at atkbdc? irq 1
-device		vga0	at isa?
+device	atkbdc	1
+device	atkbd
+device	vga
 
 # syscons is the default console driver, resembling an SCO console
-device		sc0	at isa?
+device		sc	1
 
-device		npx0	at nexus? port IO_NPX irq 13
+device		npx
 
-device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
-device		sio1	at isa? port IO_COM2 irq 3
-device		sio2	at isa? port IO_COM3 irq 5
-device		sio3	at isa? port IO_COM4 irq 9
+device		sio
 
 # Support for multiport serial cards
 
 options	COM_MULTIPORT
 
-# AST
-
-device		sio4	at isa? port 0x2a0 flags 0x701
-device		sio5	at isa? port 0x2a8 flags 0x701
-device		sio6	at isa? port 0x2b0 flags 0x701
-device		sio7	at isa? port 0x2b8 flags 0x701 irq 12
-
-# Boca Board. You must configure the ports above with -c to change the flags.
-
-device		sio8	at isa? port 0x120 flags 0xb05
-device		sio9	at isa? port 0x128 flags 0xb05
-device		sio10	at isa? port 0x130 flags 0xb05
-device		sio11	at isa? port 0x138 flags 0xb05 irq 12
-
 # Hayes ESP boards
 
 options	COM_ESP
 
 # Comtrol Rocketport
 # The PCI versions
-#device	rp0
-#device	rp1
+#device	rp
+#device	rp
 # The ISA versions
-device	rp0	at isa? port 0x100
-device	rp1	at isa? port 0x180
+device	rp
 
 # Cyclades Cyclom-Y serial driver
-device cy0	at isa? irq 10 iomem 0xd4000 iosiz 0x2000
-device cy1	at isa? irq 11 iomem 0xd6000 iosiz 0x2000
+device cy	1
 
-device ppc0	at isa? port? flags 0x40 irq 7
-device	ppbus0
-device		lpt0	at ppbus?
-device		plip0	at ppbus?
-device		ppi0	at ppbus?
+device		ppc
+device		ppbus
+device		lpt
+device		plip
+device		ppi
 
 #
 # The following Ethernet NICs are all PCI devices.
 #
-device de0              # DEC/Intel DC21x4x (``Tulip'')
-device fxp0             # Intel EtherExpress PRO/100B (82557, 82558)
+device de
+device fxp
 
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
 # Right now it appears that the ie0 must be probed before ep0. See
 # revision 1.20 of this file.
 
-device ed0 at isa? port 0x280 irq 5 iomem 0xd8000
-device ed1 at isa? port 0x300 irq 5 iomem 0xd0000
-device ep0 at isa? port 0x300 irq 10
-device ep1 at isa? port 0x280 irq 5
-device ie0 at isa? port 0x300 irq 5 iomem 0xd0000
-device lnc0 at isa? port 0x300 irq 10 drq 0
+device ed
+device ep
+device ie
+device lnc
 
-pseudo-device	loop
-pseudo-device	ether
+device	loop
+device	ether
 # iijppp uses tun instead of ppp device
-pseudo-device	ppp	8
-pseudo-device	tun	2
-#pseudo-device	vn
-pseudo-device	pty	16
-pseudo-device	md
-#pseudo-device	gzip		# Exec gzipped a.out's
+device	ppp	8
+device	tun	2
+#device	vn
+device	pty	16
+device	md
+#device	gzip		# Exec gzipped a.out's
 
 options         COMPAT_OLDISA   #Use ISA shims and glue for old drivers
 options         COMPAT_OLDPCI   #Use PCI shims and glue for old drivers
diff --git a/release/picobsd/isp/PICOBSD.hints b/release/picobsd/isp/PICOBSD.hints
new file mode 100644
index 0000000..d69345e
--- /dev/null
+++ b/release/picobsd/isp/PICOBSD.hints
@@ -0,0 +1,101 @@
+# $FreeBSD$
+hint.fdc.0.at="isa"
+hint.fdc.0.port="0x3F0"
+hint.fdc.0.irq="6"
+hint.fdc.0.drq="2"
+hint.fd.0.at="fdc0"
+hint.fd.0.drive="0"
+hint.ata.0.at="isa"
+hint.ata.0.port="0x1F0"
+hint.ata.0.irq="14"
+hint.ata.1.at="isa"
+hint.ata.1.port="0x170"
+hint.ata.1.irq="15"
+hint.atkbdc.0.at="isa"
+hint.atkbdc.0.port="0x060"
+hint.atkbd.0.at="atkbdc"
+hint.atkbd.0.irq="1"
+hint.vga.0.at="isa"
+hint.sc.0.at="isa"
+hint.npx.0.at="nexus"
+hint.npx.0.port="0x0F0"
+hint.npx.0.irq="13"
+hint.sio.0.at="isa"
+hint.sio.0.port="0x3F8"
+hint.sio.0.flags="0x10"
+hint.sio.0.irq="4"
+hint.sio.1.at="isa"
+hint.sio.1.port="0x2F8"
+hint.sio.1.irq="3"
+hint.sio.2.at="isa"
+hint.sio.2.port="0x3E8"
+hint.sio.2.irq="5"
+hint.sio.3.at="isa"
+hint.sio.3.port="0x2E8"
+hint.sio.3.irq="9"
+hint.sio.4.at="isa"
+hint.sio.4.port="0x2a0"
+hint.sio.4.flags="0x701"
+hint.sio.5.at="isa"
+hint.sio.5.port="0x2a8"
+hint.sio.5.flags="0x701"
+hint.sio.6.at="isa"
+hint.sio.6.port="0x2b0"
+hint.sio.6.flags="0x701"
+hint.sio.7.at="isa"
+hint.sio.7.port="0x2b8"
+hint.sio.7.flags="0x701"
+hint.sio.7.irq="12"
+hint.sio.8.at="isa"
+hint.sio.8.port="0x120"
+hint.sio.8.flags="0xb05"
+hint.sio.9.at="isa"
+hint.sio.9.port="0x128"
+hint.sio.9.flags="0xb05"
+hint.sio.10.at="isa"
+hint.sio.10.port="0x130"
+hint.sio.10.flags="0xb05"
+hint.sio.11.at="isa"
+hint.sio.11.port="0x138"
+hint.sio.11.flags="0xb05"
+hint.sio.11.irq="12"
+hint.rp.0.at="isa"
+hint.rp.0.port="0x100"
+hint.rp.1.at="isa"
+hint.rp.1.port="0x180"
+hint.cy.0.at="isa"
+hint.cy.0.irq="10"
+hint.cy.0.maddr="0xd4000"
+hint.cy.0.msize="0x2000"
+hint.cy.1.at="isa"
+hint.cy.1.irq="11"
+hint.cy.1.maddr="0xd6000"
+hint.cy.1.msize="0x2000"
+hint.ppc.0.at="isa"
+hint.ppc.0.flags="0x40"
+hint.ppc.0.irq="7"
+hint.lpt.0.at="ppbus"
+hint.plip.0.at="ppbus"
+hint.ppi.0.at="ppbus"
+hint.ed.0.at="isa"
+hint.ed.0.port="0x280"
+hint.ed.0.irq="5"
+hint.ed.0.maddr="0xd8000"
+hint.ed.1.at="isa"
+hint.ed.1.port="0x300"
+hint.ed.1.irq="5"
+hint.ed.1.maddr="0xd0000"
+hint.ep.0.at="isa"
+hint.ep.0.port="0x300"
+hint.ep.0.irq="10"
+hint.ep.1.at="isa"
+hint.ep.1.port="0x280"
+hint.ep.1.irq="5"
+hint.ie.0.at="isa"
+hint.ie.0.port="0x300"
+hint.ie.0.irq="5"
+hint.ie.0.maddr="0xd0000"
+hint.lnc.0.at="isa"
+hint.lnc.0.port="0x300"
+hint.lnc.0.irq="10"
+hint.lnc.0.drq="0"
diff --git a/release/picobsd/net/PICOBSD b/release/picobsd/net/PICOBSD
index c6ad003..a2f6d13 100644
--- a/release/picobsd/net/PICOBSD
+++ b/release/picobsd/net/PICOBSD
@@ -37,63 +37,54 @@ options         COMPAT_OLDPCI   #Use PCI shims and glue for old drivers
 #options	DUMMYNET
 #options	BRIDGE
 
-device	isa0
-device	pci0
+device	isa
+device	pci
 
-device	fdc0	at isa? port IO_FD1 irq 6 drq 2
-device		fd0	at fdc0 drive 0
-#device		fd1	at fdc0 drive 1
+device	fdc
 
-device  ata0    at isa? port IO_WD1 irq 14
-device  ata1    at isa? port IO_WD2 irq 15
+device  ata
 device          atadisk
 device          atapicd                 
 options         ATA_STATIC_ID           #Static device numbering
 
 # atkbdc0 controls both the keyboard and the PS/2 mouse
-device	atkbdc0	at isa? port IO_KBD
-device		atkbd0	at atkbdc? irq 1
+device		atkbdc	1
+device		atkbd
 
-device		vga0	at isa?
+device		vga
 
 # syscons is the default console driver, resembling an SCO console
-device		sc0	at isa?
+device		sc	1
 
-device		npx0	at nexus? port IO_NPX irq 13
+device		npx
 
-device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
-device		sio1	at isa? port IO_COM2 irq 3
-device		sio2	at isa? disable port IO_COM3 irq 5
-device		sio3	at isa? disable port IO_COM4 irq 9
+device		sio
 
-device		ppc0	at isa? port? flags 0x40 irq 7
-device	ppbus0
-device		lpt0	at ppbus?
-device		plip0	at ppbus?       
-device		ppi0	at ppbus?       
+device		ppc
+device		ppbus
+device		lpt
+device		plip
+device		ppi
 
 #
 # The following Ethernet NICs are all PCI devices.
 #
-device de0              # DEC/Intel DC21x4x (``Tulip'')
-device fxp0             # Intel EtherExpress PRO/100B (82557, 82558)
+device de
+device fxp
 
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
 # Right now it appears that the ie0 must be probed before ep0. See
 # revision 1.20 of this file.
 
-device ed0 at isa? port 0x280 irq 5 iomem 0xd8000
-device ed1 at isa? port 0x300 irq 10 iomem 0xd0000
-device ep0 at isa? port 0x300 irq 10
-device ep1 at isa? port 0x280 irq 5
-device ie0 at isa? port 0x300 irq 5 iomem 0xd0000
-device ie1 at isa? port 0x360 irq 7 iomem 0xd0000
+device ed
+device ep
+device ie
 
-pseudo-device	loop
-pseudo-device	ether
-pseudo-device	tun	2
-#pseudo-device	vn
-pseudo-device	pty	16
-pseudo-device	md
-#pseudo-device	gzip		# Exec gzipped a.out's
+device	loop
+device	ether
+device	tun	2
+#device	vn
+device	pty	16
+device	md
+#device	gzip		# Exec gzipped a.out's
diff --git a/release/picobsd/net/PICOBSD.hints b/release/picobsd/net/PICOBSD.hints
new file mode 100644
index 0000000..676ea78
--- /dev/null
+++ b/release/picobsd/net/PICOBSD.hints
@@ -0,0 +1,65 @@
+# $FreeBSD$
+hint.fdc.0.at="isa"
+hint.fdc.0.port="0x3F0"
+hint.fdc.0.irq="6"
+hint.fdc.0.drq="2"
+hint.fd.0.at="fdc0"
+hint.fd.0.drive="0"
+hint.ata.0.at="isa"
+hint.ata.0.port="0x1F0"
+hint.ata.0.irq="14"
+hint.ata.1.at="isa"
+hint.ata.1.port="0x170"
+hint.ata.1.irq="15"
+hint.atkbdc.0.at="isa"
+hint.atkbdc.0.port="0x060"
+hint.atkbd.0.at="atkbdc"
+hint.atkbd.0.irq="1"
+hint.vga.0.at="isa"
+hint.sc.0.at="isa"
+hint.npx.0.at="nexus"
+hint.npx.0.port="0x0F0"
+hint.npx.0.irq="13"
+hint.sio.0.at="isa"
+hint.sio.0.port="0x3F8"
+hint.sio.0.flags="0x10"
+hint.sio.0.irq="4"
+hint.sio.1.at="isa"
+hint.sio.1.port="0x2F8"
+hint.sio.1.irq="3"
+hint.sio.2.at="isa"
+hint.sio.2.disabled="1"
+hint.sio.2.port="0x3E8"
+hint.sio.2.irq="5"
+hint.sio.3.at="isa"
+hint.sio.3.disabled="1"
+hint.sio.3.port="0x2E8"
+hint.sio.3.irq="9"
+hint.ppc.0.at="isa"
+hint.ppc.0.flags="0x40"
+hint.ppc.0.irq="7"
+hint.lpt.0.at="ppbus"
+hint.plip.0.at="ppbus"
+hint.ppi.0.at="ppbus"
+hint.ed.0.at="isa"
+hint.ed.0.port="0x280"
+hint.ed.0.irq="5"
+hint.ed.0.maddr="0xd8000"
+hint.ed.1.at="isa"
+hint.ed.1.port="0x300"
+hint.ed.1.irq="10"
+hint.ed.1.maddr="0xd0000"
+hint.ep.0.at="isa"
+hint.ep.0.port="0x300"
+hint.ep.0.irq="10"
+hint.ep.1.at="isa"
+hint.ep.1.port="0x280"
+hint.ep.1.irq="5"
+hint.ie.0.at="isa"
+hint.ie.0.port="0x300"
+hint.ie.0.irq="5"
+hint.ie.0.maddr="0xd0000"
+hint.ie.1.at="isa"
+hint.ie.1.port="0x360"
+hint.ie.1.irq="7"
+hint.ie.1.maddr="0xd0000"
diff --git a/release/picobsd/router/PICOBSD b/release/picobsd/router/PICOBSD
index 215bcd6..029e344 100644
--- a/release/picobsd/router/PICOBSD
+++ b/release/picobsd/router/PICOBSD
@@ -37,52 +37,44 @@ options		NO_SWAPPING
 #options	DUMMYNET
 #options	BRIDGE
 
-device	isa0
-device	pci0
+device	isa
+device	pci
 
-device	fdc0	at isa? port IO_FD1 irq 6 drq 2
-device		fd0	at fdc0 drive 0
-#device		fd1	at fdc0 drive 1
+device	fdc
 
 # atkbdc0 controlls both the keyboard and the PS/2 mouse
-device	atkbdc0	at isa? port IO_KBD
-device		atkbd0	at atkbdc? irq 1
+device	atkbdc	1
+device		atkbd
 
-device		vga0	at isa? port ?
+device		vga
 
 # syscons is the default console driver, resembling an SCO console
-device		sc0	at isa?
+device		sc	1	
 
-device		npx0	at nexus? port IO_NPX irq 13
+device		npx
 
-device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
-device		sio1	at isa? port IO_COM2 irq 3
-device		sio2	at isa? disable port IO_COM3 irq 5
-device		sio3	at isa? disable port IO_COM4 irq 9
+device		sio
 
 # The following Ethernet NICs are all PCI devices.
 #
-device de0              # DEC/Intel DC21x4x (``Tulip'')
-device fxp0             # Intel EtherExpress PRO/100B (82557, 82558)
+device de
+device fxp
 
 # Order is important here due to intrusive probes, do *not* alphabetize
 # this list of network interfaces until the probes have been fixed.
 # Right now it appears that the ie0 must be probed before ep0. See
 # revision 1.20 of this file.
 
-device ed0 at isa? port 0x280 irq 5 iomem 0xd8000
-device ed1 at isa? port 0x300 irq 10 iomem 0xd0000
-device ep0 at isa? port 0x300 irq 10
-device ep1 at isa? port 0x280 irq 5
-device ie0 at isa? port 0x300 irq 5 iomem 0xd0000
-device ie1 at isa? port 0x360 irq 7 iomem 0xd0000
+device ed
+device ep
+device ie
 
-pseudo-device	loop
-pseudo-device	ether
-#pseudo-device	tun	2
-pseudo-device ppp 	4
-pseudo-device	pty	16
-pseudo-device	md
+device	loop
+device	ether
+#device	tun	2
+device ppp 	4
+device	pty	16
+device	md
 
 options         COMPAT_OLDISA   #Use ISA shims and glue for old drivers
 options         COMPAT_OLDPCI   #Use PCI shims and glue for old drivers
diff --git a/release/picobsd/router/PICOBSD.hints b/release/picobsd/router/PICOBSD.hints
new file mode 100644
index 0000000..b9d89f7
--- /dev/null
+++ b/release/picobsd/router/PICOBSD.hints
@@ -0,0 +1,53 @@
+# $FreeBSD$
+hint.fdc.0.at="isa"
+hint.fdc.0.port="0x3F0"
+hint.fdc.0.irq="6"
+hint.fdc.0.drq="2"
+hint.fd.0.at="fdc0"
+hint.fd.0.drive="0"
+hint.atkbdc.0.at="isa"
+hint.atkbdc.0.port="0x060"
+hint.atkbd.0.at="atkbdc"
+hint.atkbd.0.irq="1"
+hint.vga.0.at="isa"
+hint.sc.0.at="isa"
+hint.npx.0.at="nexus"
+hint.npx.0.port="0x0F0"
+hint.npx.0.irq="13"
+hint.sio.0.at="isa"
+hint.sio.0.port="0x3F8"
+hint.sio.0.flags="0x10"
+hint.sio.0.irq="4"
+hint.sio.1.at="isa"
+hint.sio.1.port="0x2F8"
+hint.sio.1.irq="3"
+hint.sio.2.at="isa"
+hint.sio.2.disabled="1"
+hint.sio.2.port="0x3E8"
+hint.sio.2.irq="5"
+hint.sio.3.at="isa"
+hint.sio.3.disabled="1"
+hint.sio.3.port="0x2E8"
+hint.sio.3.irq="9"
+hint.ed.0.at="isa"
+hint.ed.0.port="0x280"
+hint.ed.0.irq="5"
+hint.ed.0.maddr="0xd8000"
+hint.ed.1.at="isa"
+hint.ed.1.port="0x300"
+hint.ed.1.irq="10"
+hint.ed.1.maddr="0xd0000"
+hint.ep.0.at="isa"
+hint.ep.0.port="0x300"
+hint.ep.0.irq="10"
+hint.ep.1.at="isa"
+hint.ep.1.port="0x280"
+hint.ep.1.irq="5"
+hint.ie.0.at="isa"
+hint.ie.0.port="0x300"
+hint.ie.0.irq="5"
+hint.ie.0.maddr="0xd0000"
+hint.ie.1.at="isa"
+hint.ie.1.port="0x360"
+hint.ie.1.irq="7"
+hint.ie.1.maddr="0xd0000"