diff --git a/distrib/cdrom/NetBSD-current.mk b/distrib/cdrom/NetBSD-current.mk
index 60d9d67f3b1f..e1f91651afbb 100644
--- a/distrib/cdrom/NetBSD-current.mk
+++ b/distrib/cdrom/NetBSD-current.mk
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD-current.mk,v 1.6 2007/03/08 13:51:51 bouyer Exp $
+# $NetBSD: NetBSD-current.mk,v 1.7 2008/04/30 15:29:11 ad Exp $
 #
 # Configuration file for NetBSD-current.
 
@@ -18,9 +18,7 @@ INTFILES.cats=		netbsd.cats:cats/binary/kernel/netbsd.aout-INSTALL.gz
 BOOTFILE.i386=		boot.i386
 INTFILES.i386=		boot.i386:i386/binary/sets/base.tgz,./usr/mdec/bootxx_cd9660 \
 			boot:i386/binary/sets/base.tgz,./usr/mdec/boot \
-			netbsd:i386/binary/kernel/netbsd-INSTALL_LARGE.gz,link \
-			nblaptop:i386/binary/kernel/netbsd-INSTALL_LAPTOP.gz,link \
-			nbnoacpi:i386/binary/kernel/netbsd-INSTALL.gz,link
+			netbsd:i386/binary/kernel/netbsd-INSTALL.gz,link
 
 # BOOTFILE.amd64 is relative to CD staging root
 BOOTFILE.amd64=		boot.amd64
diff --git a/distrib/i386/cdroms/Makefile.cdrom b/distrib/i386/cdroms/Makefile.cdrom
index 8f59153d402a..a013705bc07e 100644
--- a/distrib/i386/cdroms/Makefile.cdrom
+++ b/distrib/i386/cdroms/Makefile.cdrom
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile.cdrom,v 1.3 2007/11/15 00:31:19 joerg Exp $
+# $NetBSD: Makefile.cdrom,v 1.4 2008/04/30 15:29:11 ad Exp $
 
 CDMAKEFSOPTIONS= bootimage=i386;bootxx.${MACHINE},no-emul-boot
 CDINSTKERNEL= ../../instkernel
-CDKERNELS=	netbsd-INSTALL_LARGE.gz	netbsd	# from ../instkernel
-CDKERNELS+=	netbsd-INSTALL.gz	nbnoacpi
+CDKERNELS=	netbsd-INSTALL.gz	netbsd	# from ../instkernel
diff --git a/distrib/i386/cdroms/bootcd/boot.cfg.in b/distrib/i386/cdroms/bootcd/boot.cfg.in
index 88543f6d662c..678a7ad795a9 100644
--- a/distrib/i386/cdroms/bootcd/boot.cfg.in
+++ b/distrib/i386/cdroms/bootcd/boot.cfg.in
@@ -4,12 +4,14 @@ banner=
 banner=This CD contains only the install kernels. Binary sets to complete the
 banner=installation must be downloaded separately.
 banner=
-banner=The default ACPI kernel should work on all modern and legacy hardware, however
-banner=if you have problems, please try the kernel without ACPI. If you have problems
-banner=on hardware manufactured after 1998 with the ACPI kernel, please report using
-banner=send-pr including dmesg output.
-menu=Install NetBSD (standard ACPI kernel):boot netbsd
-menu=Install NetBSD (no ACPI):boot nbnoacpi
-menu=Boot NetBSD from first hard disk:boot hd0a:
+banner=ACPI should work on all modern and legacy hardware, however if you have 
+banner=problems, please try disabling ACPI.
+banner=
+banner=If you encounter problems on hardware manufactured after 1998 with ACPI
+banner=enabled, please file a problem report including output from the 'dmesg'
+banner=command.
+menu=Install NetBSD:boot netbsd
+menu=Install NetBSD (no ACPI):boot netbsd -2
+menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
 menu=Drop to boot prompt:prompt
 timeout=10
diff --git a/distrib/i386/cdroms/installcd/boot.cfg.in b/distrib/i386/cdroms/installcd/boot.cfg.in
index dd8e6f3f3bb6..b947da83cca5 100644
--- a/distrib/i386/cdroms/installcd/boot.cfg.in
+++ b/distrib/i386/cdroms/installcd/boot.cfg.in
@@ -1,12 +1,14 @@
 banner=Welcome to the NetBSD @@VERSION@@ installation CD
 banner================================================================================
 banner=
-banner=The default ACPI kernel should work on all modern and legacy hardware, however
-banner=if you have problems, please try the kernel without ACPI.
+banner=ACPI should work on all modern and legacy hardware, however if you have 
+banner=problems, please try disabling ACPI.
 banner=
-banner=If you have problems on hardware manufactured after 1998 with the ACPI kernel,
-banner=please report using send-pr including dmesg output.
-menu=Install NetBSD (standard ACPI kernel):boot netbsd
-menu=Install NetBSD (no ACPI):boot nbnoacpi
+banner=If you encounter problems on hardware manufactured after 1998 with ACPI
+banner=enabled, please file a problem report including output from the 'dmesg'
+banner=command.
+menu=Install NetBSD:boot netbsd
+menu=Install NetBSD (no ACPI):boot netbsd -2
+menu=Install NetBSD (no ACPI, no SMP):boot netbsd -12
 menu=Drop to boot prompt:prompt
 timeout=10
diff --git a/distrib/i386/floppies/bootfloppy-big/Makefile b/distrib/i386/floppies/bootfloppy-big/Makefile
index c91a52524aa1..5ef753ee474b 100644
--- a/distrib/i386/floppies/bootfloppy-big/Makefile
+++ b/distrib/i386/floppies/bootfloppy-big/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.24 2007/11/15 00:31:19 joerg Exp $
+#	$NetBSD: Makefile,v 1.25 2008/04/30 15:29:11 ad Exp $
 
 # This Makefile builds a boot image on a 2.88M-sized image.
 #
@@ -16,6 +16,6 @@
 
 FLOPPYBASE=	boot-big
 FLOPPYSIZE=	7200
-FLOPPYKERNEL=	netbsd-INSTALL_LARGE.gz
+FLOPPYKERNEL=	netbsd-INSTALL_FLOPPY.gz
 
 .include "${.CURDIR}/../common/Makefile.bootfloppy"
diff --git a/distrib/i386/floppies/bootfloppy-com/Makefile b/distrib/i386/floppies/bootfloppy-com/Makefile
index 83b7680fc439..211049f2a56d 100644
--- a/distrib/i386/floppies/bootfloppy-com/Makefile
+++ b/distrib/i386/floppies/bootfloppy-com/Makefile
@@ -1,8 +1,8 @@
-#	$NetBSD: Makefile,v 1.6 2006/05/14 02:21:59 fredb Exp $
+#	$NetBSD: Makefile,v 1.7 2008/04/30 15:29:11 ad Exp $
 
 FLOPPYBASE=	boot-com
 FLOPPYMAX=	3
-FLOPPYKERNEL=	netbsd-INSTALL.gz
+FLOPPYKERNEL=	netbsd-INSTALL_FLOPPY.gz
 FLOPPYBOOTOPTIONS=	-o console=com0
 
 .include "${.CURDIR}/../common/Makefile.bootfloppy"
diff --git a/distrib/i386/floppies/bootfloppy/Makefile b/distrib/i386/floppies/bootfloppy/Makefile
index c4cf59f89ed4..cfa98f9b2f25 100644
--- a/distrib/i386/floppies/bootfloppy/Makefile
+++ b/distrib/i386/floppies/bootfloppy/Makefile
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.11 2006/05/14 02:21:59 fredb Exp $
+#	$NetBSD: Makefile,v 1.12 2008/04/30 15:29:11 ad Exp $
 
 FLOPPYBASE=	boot
 FLOPPYMAX=	3
-FLOPPYKERNEL=	netbsd-INSTALL.gz
+FLOPPYKERNEL=	netbsd-INSTALL_FLOPPY.gz
 
 .include "${.CURDIR}/../common/Makefile.bootfloppy"
diff --git a/distrib/i386/instkernel/Makefile b/distrib/i386/instkernel/Makefile
index 951f260e772c..143ac0b1ccb6 100644
--- a/distrib/i386/instkernel/Makefile
+++ b/distrib/i386/instkernel/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2008/01/23 19:52:24 bouyer Exp $
+#	$NetBSD: Makefile,v 1.10 2008/04/30 15:29:11 ad Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,8 +17,8 @@ ${V}=		${${V}DIR}/${F}.fs
 
 # If you change the list of distributed install kernels, don't forget
 # to update the release documentation in distrib/notes/common/contents
-MDSETTARGETS=	INSTALL_LARGE		${RAMDISK_B}	-
-MDSETTARGETS+=	INSTALL			${RAMDISK_B}	-
+MDSETTARGETS=	INSTALL			${RAMDISK_B}	-
+MDSETTARGETS+=	INSTALL_FLOPPY		${RAMDISK_B}	-
 MDSETTARGETS+=	INSTALL_XEN2_DOMU	${RAMDISK_B}	-
 MDSETTARGETS+=	INSTALL_XEN3_DOMU	${RAMDISK_B}	-
 MDSETTARGETS+=	INSTALL_XEN3PAE_DOMU	${RAMDISK_B}	-
diff --git a/distrib/notes/common/contents b/distrib/notes/common/contents
index 8ec5c66914b7..afd699b6f221 100644
--- a/distrib/notes/common/contents
+++ b/distrib/notes/common/contents
@@ -1,4 +1,4 @@
-.\"	$NetBSD: contents,v 1.138 2008/04/30 13:10:48 martin Exp $
+.\"	$NetBSD: contents,v 1.139 2008/04/30 15:29:11 ad Exp $
 .\"
 .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -58,31 +58,13 @@ kernel containing code for everything supported in this release.
 This kernel runs on Vr41xx and TX3922 CPUs only.
 .\} \" hpcmips
 .\} \" !atari/mac68k/sgimips/evgppc
-.if \n[macppc]:\n[sparc]:\n[sparc64]:\n[i386]:\n[amd64] \{\
+.if \n[macppc]:\n[sparc]:\n[sparc64] \{\
 .			It Pa netbsd-GENERIC.MP.gz
 A gzipped
 .Nx
 kernel containing code for everything supported in this release.  This 
 kernel also supports SMP on systems with more than one CPU.
 .\}
-.if \n[i386] \{\
-.			It Pa netbsd-GENERIC.NOACPI.gz
-A gzipped
-.Nx
-kernel containing code for everything supported in this release but without
-ACPI support, for use on legacy hardware.
-.\}
-.
-.if \n[amd64] \{\
-.			It Pa netbsd-INSTALL.gz
-A gzipped
-.Nx
-kernel which is somewhat smaller.
-This is the kernel on the install floppies and CD-ROMs.
-.			It Pa netbsd-INSTALL.symbols.gz
-Symbols for
-.Pa netbsd-INSTALL.gz .
-.\}
 .
 .if \n[hp300] \{\
 .			It Pa netbsd-RAMDISK.gz
diff --git a/distrib/notes/common/main b/distrib/notes/common/main
index 3bbec23b0834..698325f70bdf 100644
--- a/distrib/notes/common/main
+++ b/distrib/notes/common/main
@@ -1,4 +1,4 @@
-.\"	$NetBSD: main,v 1.395 2008/04/30 13:10:48 martin Exp $
+.\"	$NetBSD: main,v 1.396 2008/04/30 15:29:11 ad Exp $
 .\"
 .\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -110,56 +110,53 @@ install
 \*V on a machine of the \*M architecture.
 .Bl -bullet
 .It
-Fetch the
+Fetch files needed to install
+.Nx .
 .if \n[i386]:\n[amd64] \{\
-appropriate pair of boot floppy images from the
-.Pa \*M/installation/floppy/
-directory, or a CD-ROM image (the images from
-.Pa \*M/installation/cdrom/
-are bootable, but do not contain binary sets - these are intended for network
-installs, or when different bootblocks are needed).
-Most people will need the
+.Pp
+Option 1: bootable CD-ROM images containing the full distribution.
+.Pp
+These can be found
+on an FTP site near you, usually located in the
+.Pa /pub/NetBSD/iso
+directory.
+Check the NetBSD website for details.
+.Pp
+Option 2: bootable CD-ROM images from
+.Pa \*M/installation/cdrom/ .
+.Pp
+These images are bootable, but do not contain binary sets.
+They are intended for network installs, or system repair.
+.Pa boot.iso
+is for VGA console installation, and
+.Pa boot-com.iso
+is for installation over serial console (com0, 9600 baud).
+.Pp
+Option 3: boot floppy images from
+.Pa \*M/installation/floppy/ .
+.Pp
 .Pa boot1.fs
 and
 .Pa boot2.fs
-or
-.Pa boot.iso
-images for VGA console installation, or the
+are floppy images for VGA console installation.
 .Pa boot-com1.fs
 and
 .Pa boot-com2.fs
-or
-.Pa boot-com.iso
-images for installation via serial console.
-.if \n[i386] \{\
-You may also possibly (but not necessarily) want to use
-.Pa bootlap1.fs
-and
-.Pa bootlap2.fs
-if installing on a laptop.
-The INSTALL_LAPTOP kernel can be loaded from one of the cdrom images via
-the bootloader:
-.Ic boot Ar nblaptop .
-.\}
+are for installation via serial console (com0, 9600 baud).
+.It
+The default kernel on CD-ROMs has ACPI enabled.
+This is known to cause issues on a few machines which have buggy ACPI
+implementations.
 .Pp
-The default kernel on ISO images have ACPI enabled. This is known to cause
-issues on a few older machines which have buggy ACPI tables. To boot with
-ACPI disabled, interrupt the 
+To boot with ACPI disabled, choose the "no ACPI" option from the boot menu,
+or interrupt the menu and enter the
 .Nx
-boot loader, and enter:
-.Ic boot -c .
-At the userconf prompt, enter:
-.Ic disable acpi
-followed by:
-.Ic quit .
-.if \n[i386] \{\
-The kernel from the two floppy set is also present on the ISO images and can be
-loaded using:
-.Ic boot Ar nbnoacpi .
-.\}
-.\}
+boot prompt.
+Type 
+.Ic boot -2
+to boot with ACPI disabled.
 .if \n[macppc] \{\
-files necessary to boot your system.
+Fetch files necessary to boot your system.
 The files depend on what model you
 are using and how you plan to boot your machine.
 For systems with built-in floppy drives (Open Firmware 1 or 2), 
@@ -177,7 +174,7 @@ If you have a CD-R, you can fetch the CD image,
 .Pa macppccd-\*V.iso .
 .\}
 .if \n[sparc] \{\
-CD image,
+Fetch a CD image,
 .Pa sparccd-\*V.iso
 or the floppy disk images,
 .Pa sparc/install/floppy/disk1.gz No and Pa sparc/install/floppy/disk2 .
@@ -203,7 +200,7 @@ The actual binary distribution is in the
 .Pa \*M/binary/sets/
 directory.
 When you boot the install
-.if \n[i386] floppies,
+.if \n[i386] CD-ROM or floppies,
 .if \n[macppc] kernel from floppies, hard drive, or CD-ROM,
 .if \n[sparc] floppies or CD-ROM,
 .if \n[sparc64] CD-ROM or installation kernel,
@@ -228,9 +225,12 @@ and
 .Pa etc.tgz .
 In a typical workstation installation you will probably want
 all the installation sets.
-.if \n[i386] \{\
+.ie \n[i386]:\n[amd64] \{\
 .It
-Write the floppy images directly to a pair of floppies.
+Write the CD-ROM images or floppy images out.
+.Pp
+Many commercial and freeware programs are available to burn CD-ROMs.
+.Pp
 If you have problems writing a raw image to a floppy,
 the
 .Ic rawrite.exe
@@ -405,7 +405,7 @@ For third-party programs which are not part of the base
 .Nx
 distribution, you will want to explore the
 .Ic pkgsrc
-system with its more than 7200 program packages.
+system with its many thousands of third party software applications.
 .El
 .\}
 .Ss "What is NetBSD?"
diff --git a/distrib/notes/i386/whatis b/distrib/notes/i386/whatis
index 27ca6d618963..939c06fca19b 100644
--- a/distrib/notes/i386/whatis
+++ b/distrib/notes/i386/whatis
@@ -1,4 +1,4 @@
-.\"	$NetBSD: whatis,v 1.22 2007/12/14 07:07:29 jnemeth Exp $
+.\"	$NetBSD: whatis,v 1.23 2008/04/30 15:29:11 ad Exp $
 .
 This is the twelfth major release of
 .Nx
@@ -13,12 +13,9 @@ See the supported hardware list for details.
 Some (but not all!) notable \*M-specific improvements include:
 .(bullet
 Default kernels now have ACPI enabled by default. If this causes problems
-on your hardware, use userconf and
-.Ic disable acpi
-to boot without ACPI support.
-You can also boot a legacy kernel from cdrom using:
-.Ic boot Ar nbnoacpi ,
-and choose to install the GENERIC.NOACPI kernel set from sysinst.
+on your hardware, use the
+.Fl -2
+flag at the boot prompt to disable ACPI.
 .bullet)
 .Pp
 .Nx \*V
diff --git a/distrib/utils/sysinst/arch/i386/md.h b/distrib/utils/sysinst/arch/i386/md.h
index 2145e36a0295..529c9f580694 100644
--- a/distrib/utils/sysinst/arch/i386/md.h
+++ b/distrib/utils/sysinst/arch/i386/md.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: md.h,v 1.62 2007/12/25 01:03:31 ad Exp $	*/
+/*	$NetBSD: md.h,v 1.63 2008/04/30 15:29:11 ad Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -63,10 +63,8 @@
  */
 
 #define SET_KERNEL_GENERIC	SET_KERNEL_1
-#define	SET_KERNEL_NOACPI	SET_KERNEL_2
 
 #define SET_KERNEL_1_NAME	"kern-GENERIC"
-#define SET_KERNEL_2_NAME	"kern-GENERIC.NOACPI"
 
 /*
  * Disk names accepted as valid targets for a from-scratch installation.
diff --git a/distrib/utils/sysinst/arch/i386/msg.md.de b/distrib/utils/sysinst/arch/i386/msg.md.de
index 70177292a5b8..f1bccab2bbdc 100644
--- a/distrib/utils/sysinst/arch/i386/msg.md.de
+++ b/distrib/utils/sysinst/arch/i386/msg.md.de
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.de,v 1.14 2007/12/25 01:03:31 ad Exp $	*/
+/*	$NetBSD: msg.md.de,v 1.15 2008/04/30 15:29:11 ad Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -169,4 +169,3 @@ message updatembr
 NetBSD Bootcodes updaten?}
 
 message set_kernel_1	{Kernel (GENERIC)}
-message set_kernel_2	{Kernel (GENERIC.NOACPI)}
diff --git a/distrib/utils/sysinst/arch/i386/msg.md.en b/distrib/utils/sysinst/arch/i386/msg.md.en
index 412eccb3233b..6c36e896b59c 100644
--- a/distrib/utils/sysinst/arch/i386/msg.md.en
+++ b/distrib/utils/sysinst/arch/i386/msg.md.en
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.en,v 1.56 2007/12/25 01:03:32 ad Exp $	*/
+/*	$NetBSD: msg.md.en,v 1.57 2008/04/30 15:29:11 ad Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -164,4 +164,3 @@ message updatembr
 the latest version of the NetBSD bootcode?}
 
 message set_kernel_1	{Kernel (GENERIC)}
-message set_kernel_2	{Kernel (GENERIC.NOACPI)}
diff --git a/distrib/utils/sysinst/arch/i386/msg.md.es b/distrib/utils/sysinst/arch/i386/msg.md.es
index fb2e166f8af8..bf9e15f80ec3 100644
--- a/distrib/utils/sysinst/arch/i386/msg.md.es
+++ b/distrib/utils/sysinst/arch/i386/msg.md.es
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.es,v 1.9 2007/12/25 01:03:32 ad Exp $	*/
+/*	$NetBSD: msg.md.es,v 1.10 2008/04/30 15:29:11 ad Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -165,4 +165,3 @@ message updatembr
 Record a la ultima versión del código de arranque de NetBSD?}
 
 message set_kernel_1  {Núcleo (GENERIC)}
-message set_kernel_2  {Núcleo (GENERIC.NOACPI)}
diff --git a/distrib/utils/sysinst/arch/i386/msg.md.fr b/distrib/utils/sysinst/arch/i386/msg.md.fr
index c790c50ef8be..780cd9d9a282 100644
--- a/distrib/utils/sysinst/arch/i386/msg.md.fr
+++ b/distrib/utils/sysinst/arch/i386/msg.md.fr
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.fr,v 1.46 2007/12/25 01:03:32 ad Exp $	*/
+/*	$NetBSD: msg.md.fr,v 1.47 2008/04/30 15:29:11 ad Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -156,4 +156,3 @@ message updatembr
 avec la dernière version du code d'ammorcage de NetBSD ?}
 
 message set_kernel_1	{Kernel (GENERIC)}
-message set_kernel_2	{Kernel (GENERIC.NOACPI)}
diff --git a/distrib/utils/sysinst/arch/i386/msg.md.pl b/distrib/utils/sysinst/arch/i386/msg.md.pl
index 9594f74fcccd..3cc3f4da2ad0 100644
--- a/distrib/utils/sysinst/arch/i386/msg.md.pl
+++ b/distrib/utils/sysinst/arch/i386/msg.md.pl
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.pl,v 1.29 2007/12/25 01:03:32 ad Exp $	*/
+/*	$NetBSD: msg.md.pl,v 1.30 2008/04/30 15:29:11 ad Exp $	*/
 /*	Based on english version: */
 /*	NetBSD: msg.md.en,v 1.24 2001/01/27 07:34:39 jmc Exp 	*/
 
@@ -159,4 +159,3 @@ message updatembr	/* XXX translate */
 the latest version of the NetBSD bootcode?}
 
 message set_kernel_1	{Kernel (GENERIC)}
-message set_kernel_2	{Kernel (GENERIC.NOACPI)}
diff --git a/etc/etc.i386/Makefile.inc b/etc/etc.i386/Makefile.inc
index 3053b4364381..87bf275a961a 100644
--- a/etc/etc.i386/Makefile.inc
+++ b/etc/etc.i386/Makefile.inc
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.inc,v 1.56 2008/03/18 04:20:37 lukem Exp $
+#	$NetBSD: Makefile.inc,v 1.57 2008/04/30 15:29:11 ad Exp $
 #
 #	etc.i386/Makefile.inc -- i386-specific etc Makefile targets
 #
@@ -7,7 +7,6 @@
 # to update the release documentation in distrib/notes/common/contents
 
 KERNEL_SETS=	GENERIC
-KERNEL_SETS+=	GENERIC.NOACPI
 KERNEL_SETS+=	XEN2_DOM0
 KERNEL_SETS+=	XEN2_DOMU
 KERNEL_SETS+=	XEN3_DOM0
@@ -16,9 +15,8 @@ KERNEL_SETS+=	XEN3PAE_DOMU
 # KERNEL_SETS+=	GENERIC_TINY
 # KERNEL_SETS+=	GENERIC_PS2TINY
 
-BUILD_KERNELS=	ALL
-BUILD_KERNELS+=	INSTALL_LARGE
 BUILD_KERNELS+=	INSTALL
+BUILD_KERNELS+=	INSTALL_FLOPPY
 BUILD_KERNELS+=	INSTALL_XEN2_DOMU
 BUILD_KERNELS+=	INSTALL_XEN3_DOMU
 BUILD_KERNELS+=	INSTALL_XEN3PAE_DOMU
diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL
index 6168ed372abb..abc6238c8722 100644
--- a/sys/arch/i386/conf/ALL
+++ b/sys/arch/i386/conf/ALL
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.168 2008/04/30 14:13:26 ad Exp $
+# $NetBSD: ALL,v 1.169 2008/04/30 15:29:11 ad Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"ALL-$Revision: 1.168 $"
+#ident 		"ALL-$Revision: 1.169 $"
 
 maxusers	32		# estimated number of users
 
@@ -309,11 +309,6 @@ config		netbsd	root on ? type ?
 # Device configuration
 #
 
-mainbus0 at root
-
-cpu* at mainbus?
-ioapic* at mainbus?
-
 # Doesn't do anything yet.
 p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC
 
@@ -336,8 +331,6 @@ ipmi0		at mainbus?
 
 # This option can be used to retrieve CPU and APIC information.
 # that I/O APICs can be used if ACPI is enabled below.
-# To use the I/O APIC(s), enable the ioapic line above.
-#options 	MPBIOS		# configure CPUs and APICs using MPBIOS
 #options 	MPBIOS_SCANPCI	# find PCI roots using MPBIOS
 #options 	ACPI_SCANPCI	# find PCI roots using ACPI
 
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 4433a0ac2726..39edf6603eba 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.890 2008/04/22 22:37:14 cegger Exp $
+# $NetBSD: GENERIC,v 1.891 2008/04/30 15:29:11 ad Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.890 $"
+#ident 		"GENERIC-$Revision: 1.891 $"
 
 maxusers	64		# estimated number of users
 
@@ -99,9 +99,7 @@ options 	SYSVSHM		# System V-like memory sharing
 options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
 
 options 	LKM		# loadable kernel modules
-options 	MULTIPROCESSOR	# SMP
 options 	APM_NO_IDLE	# needed for SMP
-options 	MPBIOS		# configure CPUs and APICs using MPBIOS
 
 options 	USERCONF	# userconf(4) support
 #options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
@@ -313,11 +311,6 @@ config		netbsd	root on ? type ?
 # Device configuration
 #
 
-mainbus0 at root
-
-cpu* at mainbus?
-ioapic* at mainbus?
-
 # Doesn't do anything yet.
 #p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC
 
@@ -340,8 +333,6 @@ ioapic* at mainbus?
 
 # This option can be used to retrieve CPU and APIC information.
 # that I/O APICs can be used if ACPI is enabled below.
-# To use the I/O APIC(s), enable the ioapic line above.
-#options 	MPBIOS		# configure CPUs and APICs using MPBIOS
 #options 	MPBIOS_SCANPCI	# find PCI roots using MPBIOS
 options 	ACPI_SCANPCI	# find PCI roots using ACPI
 
diff --git a/sys/arch/i386/conf/GENERIC_PS2TINY b/sys/arch/i386/conf/GENERIC_PS2TINY
index 4926ed5d2600..9f54b8aa1822 100644
--- a/sys/arch/i386/conf/GENERIC_PS2TINY
+++ b/sys/arch/i386/conf/GENERIC_PS2TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_PS2TINY,v 1.51 2008/01/16 09:37:06 ad Exp $
+#	$NetBSD: GENERIC_PS2TINY,v 1.52 2008/04/30 15:29:11 ad Exp $
 #
 #	GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains
 #	IBM PS/2 related stuff and has been generally trimmed down somewhat,
@@ -158,8 +158,6 @@ config		netbsd root on ? type ?
 # Device Configuration
 #
 
-mainbus0 at root
-cpu0	at mainbus0
 mca0	at mainbus0
 isa0	at mainbus0
 
diff --git a/sys/arch/i386/conf/GENERIC_TINY b/sys/arch/i386/conf/GENERIC_TINY
index cae4aae21b21..220e03ee4523 100644
--- a/sys/arch/i386/conf/GENERIC_TINY
+++ b/sys/arch/i386/conf/GENERIC_TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC_TINY,v 1.112 2008/02/29 14:42:32 jmmv Exp $
+#	$NetBSD: GENERIC_TINY,v 1.113 2008/04/30 15:29:11 ad Exp $
 #
 #	GENERIC_TINY -- suitable default for 4M machines
 #			No EISA, PCI, or SCSI.
@@ -198,10 +198,6 @@ options 	PCDISPLAY_SOFTCURSOR
 # Device configuration
 #
 
-mainbus0 at root
-
-cpu0 at mainbus0
-
 #apm0	at mainbus0			# Advanced power management
 
 
diff --git a/sys/arch/i386/conf/INSTALL b/sys/arch/i386/conf/INSTALL
index ea8e7070ccf9..e5b9b3ef9a56 100644
--- a/sys/arch/i386/conf/INSTALL
+++ b/sys/arch/i386/conf/INSTALL
@@ -1,783 +1,15 @@
-#	$NetBSD: INSTALL,v 1.323 2008/03/29 00:40:02 cube Exp $
+# $NetBSD: INSTALL,v 1.324 2008/04/30 15:29:11 ad Exp $
 #
 #	INSTALL - Installation kernel.
 #
-#	This kernel should be derived from GENERIC with some features
-#	commented out.
-#
-#	This kernel does NOT support X, mice, audio devices, non-NetBSD
-#	emulation.
-#
+#	This kernel is derived from GENERIC with additional memory disk
+#	options.
 
-include "arch/i386/conf/std.i386"
+include	"arch/i386/conf/GENERIC"
 
-#options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
+#ident 		"INSTALL-$Revision: 1.324 $"
 
-makeoptions 	CPUFLAGS="-march=i486 -mtune=i486"	# i486 is densest code
-makeoptions 	COPTS="-Os"
-makeoptions 	USE_SSP="no"
-
-# Enable the hooks used for initializing the root memory-disk.
 options 	MEMORY_DISK_HOOKS
-options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
-options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
-options 	MEMORY_DISK_ROOT_SIZE=10000	# size of memory disk, in blocks
-
-maxusers	2		# estimated number of users
-
-# CPU-related options.
-#options 	VM86		# virtual 8086 emulation
-#options 	USER_LDT	# user-settable LDT; used by WINE
-
-# This option allows you to force a serial console at the specified
-# I/O address.
-#options 	CONSDEVNAME="\"com\"",CONADDR=0x3f8,CONSPEED=9600
-
-# The following options override the memory sizes passed in from the boot
-# block.  Use them *only* if the boot block is unable to determine the correct
-# values.  Note that the BIOS may *correctly* report less than 640k of base
-# memory if the extended BIOS data area is located at the top of base memory
-# (as is the case on most recent systems).
-#options 	REALBASEMEM=...	# size of base memory
-#options 	REALEXTMEM=...	# size of extended memory
-
-# Avoid irq 5 and 7, the most likely cause of problems on modern laptops.
-options 		PCIC_ISA_INTR_ALLOC_MASK=0xff5f
-
-# Standard system options
-
-options 	INSECURE	# disable kernel security levels
-
-options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
-#options 	NTP		# NTP phase/frequency locked loop
-
-#options 	KTRACE		# system call tracing via ktrace(1)
-
-#options 	SYSVMSG		# System V-like message queues
-#options 	SYSVSEM		# System V-like semaphores
-#options 	SYSVSHM		# System V-like memory sharing
-#options 	SHMMAXPGS=2048	# 2048 pages is the default
-
-#options 	LKM		# loadable kernel modules
-
-options 	USERCONF	# userconf(4) support
-options 	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
-#options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
-no options 	EXEC_AOUT
-
-no options 	RFC2292		# Previous version of Adv. Sockets API for IPv6
-no options 	PTRACE		# Include ptrace(2)
-
-# Diagnostic/debugging support options
-#options 	DIAGNOSTIC	# expensive kernel consistency checks
-#options 	DEBUG		# expensive debugging checks/support
-#options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
-options 	DDB		# in-kernel debugger
-#options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
-#options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
-#options 	KGDB		# remote debugger
-#options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
-#makeoptions 	DEBUG="-g"	# compile full symbol table
-
-# Compatibility options
-#options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
-#options 	COMPAT_09	# NetBSD 0.9
-#options 	COMPAT_10	# NetBSD 1.0
-#options 	COMPAT_11	# NetBSD 1.1
-#options 	COMPAT_12	# NetBSD 1.2, 386BSD, and BSDI
-#options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
-#options 	COMPAT_14	# NetBSD 1.4
-#options 	COMPAT_15	# NetBSD 1.5
-#options 	COMPAT_16	# NetBSD 1.6
-options 	COMPAT_20	# NetBSD 2.0
-options 	COMPAT_30	# NetBSD 3.0 compatibility.
-options 	COMPAT_40	# NetBSD 4.0
-#options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
-#options 	COMPAT_386BSD_MBRPART # recognize old partition ID
-#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
-
-#options 	COMPAT_SVR4	# binary compatibility with SVR4
-#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
-#options 	COMPAT_LINUX	# binary compatibility with Linux
-#options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
-options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
-
-# File systems
-file-system 	FFS		# UFS
-file-system 	EXT2FS		# second extended file system (linux)
-#file-system 	LFS		# log-structured file system
-file-system 	MFS		# memory file system
-file-system 	NFS		# Network File System client
-file-system 	NTFS		# Windows/NT Filesystem
-file-system 	CD9660		# ISO 9660 + Rock Ridge file system
-file-system 	MSDOSFS		# MS-DOS file system
-#file-system 	FDESC		# /dev/fd
-#file-system 	KERNFS		# /kern
-#file-system 	NULLFS		# loopback file system
-#file-system 	PORTAL		# portal filesystem (still experimental)
-#file-system 	PROCFS		# /proc
-#file-system 	UMAPFS		# NULLFS + uid and gid remapping
-#file-system 	UNION		# union file system
-#file-system 	PTYFS		# /dev/pts/N support
-#file-system 	TMPFS		# Efficient memory file-system
-
-# Filesystem options
-#options 	QUOTA		# UFS quotas
-#options 	NFSSERVER	# Network File System server
-options 	NFS_V2_ONLY	# Exclude NFS3 code to save space
-options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
-#options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
-				# immutable) behave as system flags.
-
-# Networking options
-#options 	GATEWAY		# packet forwarding
-options 	INET		# IP + ICMP + TCP + UDP
-options 	INET6		# IPv6
-#options 	MROUTING	# IP multicast routing
-#options 	PIM		# Protocol Independent Multicast
-#options 	ISO,TPIP	# OSI
-#options 	EON		# OSI tunneling over IP
-#options 	NETATALK	# AppleTalk networking protocols
-#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
-#options 	PPP_DEFLATE	# Deflate compression support for PPP
-#options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
-#options 	PFIL_HOOKS	# pfil(9) packet filter hooks
-#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
-
-# These options enable verbose messages for several subsystems.
-# Warning, these may compile large string tables into the kernel!
-#options 	EISAVERBOSE	# verbose EISA device autoconfig messages
-#options 	MIIVERBOSE	# verbose PHY autoconfig messages
-#options 	PCIVERBOSE	# verbose PCI device autoconfig messages
-#options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
-#options 	PCMCIAVERBOSE	# verbose PCMCIA configuration messages
-#options 	SCSIVERBOSE	# human readable SCSI error messages
-
-#
-# wscons options
-#
-# builtin terminal emulations 
-#options 	WSEMUL_SUN		# sun terminal emulation
-options 	WSEMUL_VT100		# VT100 / VT220 emulation
-# customization of console and kernel output - see dev/wscons/wsdisplayvar.h
-#options 	WSDISPLAY_CUSTOM_OUTPUT	# color customization from wsconsctl(8)
-#options 	WS_DEFAULT_FG=WSCOL_WHITE
-#options 	WS_DEFAULT_BG=WSCOL_BLACK
-#options 	WS_DEFAULT_COLATTR="(0)"
-#options 	WS_DEFAULT_MONOATTR="(0)"
-#options 	WS_KERNEL_FG=WSCOL_GREEN
-#options 	WS_KERNEL_BG=WSCOL_BLACK
-#options 	WS_KERNEL_COLATTR=""
-#options 	WS_KERNEL_MONOATTR=""
-# customization of console border color
-#options 	WSDISPLAY_CUSTOM_BORDER	# border customization from wsconsctl(8)
-#options 	WSDISPLAY_BORDER_COLOR=WSCOL_BLUE	# default color
-# compatibility to other console drivers
-#options 	WSDISPLAY_COMPAT_PCVT           # emulate some ioctls
-#options 	WSDISPLAY_COMPAT_SYSCONS        # emulate some ioctls
-#options 	WSDISPLAY_COMPAT_USL            # VT handling
-#options 	WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
-# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
-#options 	PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
-# allocate a number of virtual screens at autoconfiguration time
-#options 	WSDISPLAY_DEFAULTSCREENS=4
-# use a large software cursor that doesn't blink
-options 	PCDISPLAY_SOFTCURSOR
-# modify the screen type of the console; defaults to "80x25"
-#options 	VGA_CONSOLE_SCREENTYPE="\"80x24\""
-
-# Kernel root file system and dump configuration.
-config		netbsd	root on ? type ?
-#config		netbsd	root on sd0a type ffs
-#config		netbsd	root on ? type nfs
-
-#
-# Device configuration
-#
-
-mainbus0 at root
-
-cpu* at mainbus?
-
-#apm0	at mainbus0			# Advanced power management
-
-
-# Basic Bus Support
-
-# PCI bus support
-pci*	at mainbus? bus ?
-pci*	at pchb? bus ?
-pci*	at ppb? bus ?
-
-# PCI bridges
-pchb*	at pci? dev ? function ?	# PCI-Host bridges
-pceb*	at pci? dev ? function ?	# PCI-EISA bridges
-pcib*	at pci? dev ? function ?	# PCI-ISA bridges
-ppb*	at pci? dev ? function ?	# PCI-PCI bridges
-# XXX 'puc's aren't really bridges, but there's no better place for them here
-#puc*	at pci? dev ? function ?	# PCI "universal" comm. cards
-
-# EISA bus support
-eisa0	at mainbus?
-eisa0	at pceb?
-
-# ISA bus support
-isa0	at mainbus?
-isa0	at pceb?
-isa0	at pcib?
-
-# PCMCIA bus support
-pcmcia*	at pcic? controller ? socket ?
-pcmcia*	at tcic? controller ? socket ?
-
-# ISA PCMCIA controllers
-pcic0 	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
-pcic1 	at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
-pcic2	at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
-tcic0 	at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
-
-# PCI PCMCIA controllers
-pcic0	at pci? dev? function ?
-
-# ISA Plug-and-Play bus support
-isapnp0	at isa?
-
-# ISA Plug-and-Play PCMCIA controllers
-pcic*	at isapnp?
-
-# Coprocessor Support
-
-# Math Coprocessor support
-npx0	at isa? port 0xf0 irq 13	# x86 math coprocessor
-
-
-# Console Devices
-
-# wscons
-pckbc0		at isa?			# pc keyboard controller
-pckbd*		at pckbc?		# PC keyboard
-#pms*		at pckbc?		# PS/2 mouse for wsmouse
-vga0		at isa?
-vga*		at pci? dev ? function ?
-pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
-wsdisplay*	at vga? console ?
-wsdisplay*	at pcdisplay? console ?
-wskbd*		at pckbd? console ?
-#wsmouse*	at pms? mux 0
-
-#attimer0	at isa?
-#pcppi0		at isa?
-#sysbeep0	at pcppi?
-
-# Serial Devices
-
-# PCI serial interfaces
-#com*	at puc? port ?			# 16x50s on "universal" comm boards
-#cy*	at pci? dev ? function ?	# Cyclades Cyclom-Y serial boards
-
-# ISA Plug-and-Play serial interfaces
-com*	at isapnp?			# Modems and serial boards
-
-# PCMCIA serial interfaces
-com*	at pcmcia? function ?		# Modems and serial cards
-
-pcmcom*	at pcmcia? function ?		# PCMCIA multi-port serial cards
-com*	at pcmcom? slave ?		# ...and the slave devices
-
-# ISA serial interfaces
-#options 	COM_HAYESP		# adds Hayes ESP serial board support
-com0	at isa? port 0x3f8 irq 4	# Standard PC serial ports
-com1	at isa? port 0x2f8 irq 3
-com2	at isa? port 0x3e8 irq 5
-#com3	at isa? port 0x2e8 irq 9
-#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
-#com*	at ast? slave ?
-#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
-#com*	at boca? slave ?
-#tcom0	at isa? port 0x100 irq 7	# TC-800 8-port serial cards
-#com*	at tcom? slave ?
-#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
-#com*	at rtfps? slave ?
-#cy0	at isa? iomem 0xd4000 irq 12	# Cyclades serial cards
-
-
-# Parallel Printer Interfaces
-
-# PCI parallel printer interfaces
-#lpt*	at puc? port ?			# || ports on "universal" comm boards
-
-# ISA parallel printer interfaces
-#lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
-#lpt1	at isa? port 0x278
-#lpt2	at isa? port 0x3bc
-
-# I2O devices
-iop*	at pci? dev ? function ?	# I/O processor
-iopsp*	at iop? tid ?			# SCSI/FC-AL ports
-ld*	at iop? tid ?			# Block devices
-#dpti*	at iop? tid 0			# DPT/Adaptec control interface
-
-# SCSI Controllers and Devices
-
-# PCI SCSI controllers
-adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
-adw*	at pci? dev ? function ?	# AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
-ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
-ahd*	at pci? dev ? function ?	# Adaptec 29320, 39320 (aic790x) SCSI
-bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
-dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID
-iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
-mfi*	at pci? dev ? function ?	# LSI MegaRAID SAS
-mly*	at pci? dev ? function ?	# Mylex AcceleRAID and eXtremeRAID
-mpt*	at pci? dev ? function ?	# LSI Fusion SCSI/FC
-pcscp*	at pci? dev ? function ?	# AMD 53c974 PCscsi-PCI SCSI
-siop*	at pci? dev ? function ?	# NCR 53c8xx SCSI (new driver)
-trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI
-
-# EISA SCSI controllers
-ahb*	at eisa? slot ?			# Adaptec 174[02] SCSI
-ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI
-bha*	at eisa? slot ?			# BusLogic 7xx SCSI
-dpt*	at eisa? slot ?			# DPT SmartCache/SmartRAID
-uha*	at eisa? slot ?			# UltraStor 24f SCSI
-
-# PCMCIA SCSI controllers
-aic*	at pcmcia? function ?		# Adaptec APA-1460 SCSI
-
-# ISA Plug-and-Play SCSI controllers
-aha*	at isapnp? 			# Adaptec AHA-154[02
-aic*	at isapnp?			# Adaptec AHA-1520B
-
-# ISA SCSI controllers
-adv0	at isa? port ? irq ? drq ?	# AdvanSys APB-514[02]
-aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI
-aha1	at isa? port 0x334 irq ? drq ?
-ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI
-aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI
-bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [457]4X SCSI
-bha1	at isa? port 0x334 irq ? drq ?
-# The "nca" and "dpt" probes might give false hits or hang your machine.
-#dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
-#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
-#nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
-sea0	at isa? iomem 0xc8000 irq 5	# Seagate/Future Domain SCSI
-uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI
-uha1	at isa? port 0x340 irq ? drq ?
-wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
-wds1	at isa? port 0x358 irq 11 drq 5
-
-# SCSI bus support
-scsibus* at scsi?
-
-# SCSI devices
-sd*	at scsibus? target ? lun ?	# SCSI disk drives
-st*	at scsibus? target ? lun ?	# SCSI tape drives
-cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
-#ch*	at scsibus? target ? lun ?	# SCSI autochangers
-#ss*	at scsibus? target ? lun ?	# SCSI scanners
-#uk*	at scsibus? target ? lun ?	# SCSI unknown
-
-
-# RAID controllers and devices
-aac*	at pci? dev ? function ?	# Adaptec AAC family
-amr*	at pci? dev ? function ?	# AMI/LSI Logic MegaRAID
-cac*	at eisa? slot ?			# Compaq EISA array controllers
-cac*	at pci? dev ? function ?	# Compaq PCI array controllers
-ciss*	at pci? dev ? function ?	# HP Smart Array controllers
-icp*	at pci? dev ? function ?	# ICP-Vortex GDT & Intel RAID
-mlx*	at pci? dev ? function ?	# Mylex DAC960 & DEC SWXCR family
-mlx*	at eisa? slot ?			# Mylex DAC960 & DEC SWXCR family
-twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers
-twa*	at pci? dev ? function ?	# 3ware Escalade 95xx RAID controllers
-
-ld*	at aac? unit ?			# logical disk devices
-ld*	at amr? unit ?
-ld*	at cac? unit ?
-ld*	at icp? unit ?
-ld*	at twe? unit ?
-ld*	at twa? unit ?
-ld*	at mlx? unit ?
-
-icpsp*	at icp? unit ?			# SCSI pass-through
-
-# IDE and related devices
-# PCI IDE controllers - see pciide(4) for supported hardware.
-# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
-# how to set up DMA modes for this chip. This may work, or may cause
-# a machine hang with some controllers.
-pciide* 	at pci? dev ? function ? flags 0x0000	# GENERIC pciide driver
-acardide*	at pci? dev ? function ?	# Acard IDE controllers
-aceride* 	at pci? dev ? function ?	# Acer Lab IDE controllers
-#ahcisata* 	at pci? dev ? function ?	# AHCI SATA controllers
-artsata*	at pci? dev ? function ?	# Intel i31244 SATA controller
-cmdide* 	at pci? dev ? function ?	# CMD tech IDE controllers
-cypide* 	at pci? dev ? function ?	# Cypress IDE controllers
-geodeide* 	at pci? dev ? function ?	# AMD Geode IDE controllers
-hptide* 	at pci? dev ? function ?	# Triones/HighPoint IDE controllers
-iteide* 	at pci? dev ? function ?	# IT Express IDE controllers
-#ixpide*		at pci? dev ? function ?	# ATI IXP IDE controllers
-optiide* 	at pci? dev ? function ?	# Opti IDE controllers
-piixide* 	at pci? dev ? function ?	# Intel IDE controllers
-pdcide* 	at pci? dev ? function ?	# Promise IDE controllers
-pdcsata*	at pci? dev ? function ?	# Promise SATA150 controllers
-rccide* 	at pci? dev ? function ?	# ServerWorks IDE controllers
-satalink*	at pci? dev ? function ?	# SiI SATALink controllers
-siside* 	at pci? dev ? function ?	# SiS IDE controllers
-slide* 		at pci? dev ? function ?	# Symphony Labs IDE controllers
-#svwsata* 	at pci? dev ? function ?	# ServerWorks SATA controllers
-viaide* 	at pci? dev ? function ?	# VIA/AMD/Nvidia IDE controllers
-stpcide*	at pci? dev ? function ?	# STMicro STPC IDE controllers
-
-# ISA Plug-and-Play IDE controllers
-wdc*	at isapnp?
-
-# PCMCIA IDE controllers
-wdc*	at pcmcia? function ?
-
-# ISA ST506, ESDI, and IDE controllers
-# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
-# fall back to 16bits I/O if 32bits I/O are not functional).
-# Some controllers pass the initial 32bit test, but will fail later.
-wdc0	at isa? port 0x1f0 irq 14 flags 0x00
-wdc1	at isa? port 0x170 irq 15 flags 0x00
-
-# ATA (IDE) bus support
-atabus* at ata?
-
-# IDE drives
-# Flags are used only with controllers that support DMA operations
-# and mode settings (e.g. some pciide controllers)
-# The lowest order four bits (rightmost digit) of the flags define the PIO
-# mode to use, the next set of four bits the DMA mode and the third set the
-# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode
-# to use, and the last bit must be 1 for this setting to be used.
-# For DMA and UDMA, 0xf (1111) means 'disable'.
-# 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
-# (0xc=1100, 0xa=1010, 0xf=1111)
-# 0x0000 means "use whatever the drive claims to support".
-wd*	at atabus? drive ? flags 0x0000
-
-# ATA RAID configuration support, as found on some Promise controllers.
-pseudo-device	ataraid
-ld*	at ataraid? vendtype ? unit ?
-
-# ATAPI bus support
-atapibus* at atapi?
-
-# ATAPI devices
-# flags have the same meaning as for IDE drives.
-cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
-sd*	at atapibus? drive ? flags 0x0000	# ATAPI disk drives
-st*	at atapibus? drive ? flags 0x0000	# ATAPI tape drives
-#uk*	at atapibus? drive ? flags 0x0000	# ATAPI unknown
-
-
-# Miscellaneous mass storage devices
-
-# ISA floppy
-fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
-#fdc1	at isa? port 0x370 irq ? drq ?
-fd*	at fdc? drive ?			# the drives themselves
-# some machines need you to do this instead of fd*
-#fd0	at fdc0 drive 0
-
-# ISA CD-ROM devices
-#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
-
-# ISA tape devices
-# note: the wt driver conflicts unpleasantly with ed devices at the
-# same I/O address. The probe reprograms their EEPROMs. Don't
-# uncomment it unless you are actually using it.
-#wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives
-
-
-# Network Interfaces
-
-# PCI network interfaces
-an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
-ath*	at pci? dev ? function ?	# Atheros 5210/5211/5212 802.11
-atw*	at pci? dev ? function ?	# ADMtek ADM8211 (802.11)
-bce* 	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
-bge* 	at pci? dev ? function ?	# Broadcom 570x Gigabit Ethernet
-# bnx* 	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
-#en*	at pci? dev ? function ?	# ENI/Adaptec ATM
-ep*	at pci? dev ? function ?	# 3Com 3c59x
-ex*	at pci? dev ? function ?	# 3Com 90x[BC]
-epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
-#esh*	at pci? dev ? function ?	# Essential HIPPI card
-fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI
-fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
-gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
-#hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
-#ipw*	at pci? dev ? function ?	# Intel PRO/Wireless 2100
-#iwi*	at pci? dev ? function ?	# Intel PRO/Wireless 2200BG
-#le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
-lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
-#lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
-mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
-msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet
-mtd*	at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
-ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
-#nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
-#ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
-pcn*	at pci? dev ? function ?	# AMD PCnet-PCI Ethernet
-re*	at pci? dev ? function ?	# Realtek 8139C+/8169/8169S/8110S
-rtk*	at pci? dev ? function ?	# Realtek 8129/8139
-sf*	at pci? dev ? function ?	# Adaptec AIC-6915 Ethernet
-sip*	at pci? dev ? function ?	# SiS 900/DP83815 Ethernet
-skc*	at pci? dev ? function ?	# SysKonnect SK9821 Gigabit Ethernet
-sk*	at skc?				# SysKonnect SK9821 Gigabit Ethernet
-ste*	at pci? dev ? function ?	# Sundance ST-201 Ethernet
-stge*	at pci? dev ? function ?	# Sundance/Tamarack TC9021 Gigabit
-ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet
-tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
-tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones
-#txp*	at pci? dev ? function ?	# 3com 3cr990
-#vge*	at pci? dev ? function ?	# VIATech VT612X Gigabit Ethernet
-vr*	at pci? dev ? function ?	# VIA Rhine Fast Ethernet
-wi*	at pci? dev ? function ?	# Intersil Prism Mini-PCI (802.11b)
-wm*	at pci? dev ? function ?	# Intel 8254x gigabit
-
-# EISA network interfaces
-ep*	at eisa? slot ?			# 3Com 3c579 Ethernet
-fea*	at eisa? slot ?			# DEC DEFEA FDDI
-tlp*	at eisa? slot ?			# DEC DE-425 Ethernet
-
-# ISA Plug-and-Play network interfaces
-an*	at isapnp?			# # Aironet 802.11
-ep*	at isapnp?			# 3Com 3c509 Ethernet
-fmv*	at isapnp?			# Fujitsu FMV-183
-le*	at isapnp?			# AMD PCnet-ISA Ethernet
-ne*	at isapnp?			# NE2000-compatible Ethernet
-tr*	at isapnp?			# IBM/3COM TROPIC Token-Ring
-
-# PCMCIA network interfaces
-an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11)
-awi*	at pcmcia? function ?		# BayStack 650 (802.11FH)
-cnw*	at pcmcia? function ?		# Xircom/Netwave AirSurfer
-cs*	at pcmcia? function ?		# CS89xx Ethernet
-ep*	at pcmcia? function ?		# 3Com 3c589 and 3c562 Ethernet
-mbe*	at pcmcia? function ?		# MB8696x based Ethernet
-ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
-ray* 	at pcmcia? function ?		# Raytheon Raylink (802.11)
-sm*	at pcmcia? function ?		# Megahertz Ethernet
-wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
-options 	WI_PCMCIA_SPECTRUM24T_FW=0
-xirc*	at pcmcia? function ?		# Xircom CreditCard Ethernet
-com*	at xirc?
-xi*	at xirc?
-mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
-com*	at mhzc?
-sm*	at mhzc?
-
-# ISA network interfaces
-ate0	at isa? port 0x2a0 irq ?		# AT1700
-cs0	at isa? port 0x300 iomem ? irq ? drq ?	# CS8900 Ethernet
-ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3Com 3c503 Ethernet
-eg0	at isa? port 0x280 irq 9		# 3C505 ethernet cards
-el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
-ep*	at isa? port ? irq ?			# 3C509 ethernet cards
-ef0	at isa? port 0x360 iomem 0xd0000 irq 7	# 3C507
-ai0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN
-fmv0	at isa? port 0x2a0 irq ?		# FMV-181/182
-ix0	at isa? port 0x300 irq 10		# EtherExpress/16
-iy0	at isa? port 0x360 irq ?		# EtherExpress PRO 10 ISA
-lc0	at isa? port 0x320 iomem ? irq ?	# DEC EtherWORKS III (LEMAC)
-depca0	at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5	# DEPCA
-le*	at depca?
-nele0	at isa? port 0x320 irq 9 drq 7		# NE2100
-le*	at nele?
-bicc0	at isa? port 0x320 irq 10 drq 7		# BICC IsoLan
-le*	at bicc?
-ne0	at isa? port 0x280 irq 9		# NE[12]000 ethernet cards
-ne1	at isa? port 0x300 irq 10
-sm0	at isa? port 0x300 irq 10		# SMC91C9x Ethernet
-tr0	at isa? port 0xa20 iomem 0xd8000 irq ?	# IBM TROPIC based Token-Ring
-tr1	at isa? port 0xa24 iomem 0xd0000 irq ?	# IBM TROPIC based Token-Ring
-tr*	at isa? port ? irq ?			# 3COM TROPIC based Token-Ring
-we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC Ethernet
-we1	at isa? port 0x300 iomem 0xcc000 irq 10
-
-# MII/PHY support
-acphy*	at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
-amhphy* at mii? phy ?			# AMD 79c901 Ethernet PHYs
-bmtphy* at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
-brgphy* at mii? phy ?			# Broadcom BCM5400-family PHYs
-#ciphy*	at mii? phy ?			# Cicada CS8201 Gig-E PHYs
-dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
-exphy*	at mii? phy ?			# 3Com internal PHYs
-glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
-gphyter* at mii? phy ?			# NS83861 Gig-E PHY
-icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS189x
-igphy*	at mii? phy ?			# Intel IGP01E1000
-ikphy*	at mii? phy ?			# Intel 82563 PHYs
-inphy*	at mii? phy ?			# Intel 82555 PHYs
-iophy*	at mii? phy ?			# Intel 82553 PHYs
-lxtphy*	at mii? phy ?			# Level One LXT-970 PHYs
-makphy*	at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
-nsphy*	at mii? phy ?			# NS83840 PHYs
-nsphyter* at mii? phy ?			# NS83843 PHYs
-pnaphy* at mii? phy ?			# generic HomePNA PHYs
-qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
-rgephy*	at mii? phy ?			# Realtek 8169S/8110S internal PHYs
-rlphy*	at mii? phy ?			# Realtek 8139/8201L PHYs
-sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
-tlphy*	at mii? phy ?			# ThunderLAN PHYs
-tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
-urlphy*	at mii? phy ?			# Realtek RTL8150L internal PHYs
-ukphy*	at mii? phy ?			# generic unknown PHYs
-
-# USB Controller and Devices
-
-# PCI USB controllers
-ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
-uhci*	at pci?				# Universal Host Controller (Intel)
-ohci*	at pci?				# Open Host Controller
-
-# USB bus support
-usb*	at ehci?
-usb*	at uhci?
-usb*	at ohci?
-
-# USB Hubs
-uhub*	at usb?
-uhub*	at uhub? port ?
-
-# USB HID device
-uhidev*	at uhub? port ? configuration ? interface ?
-
-# USB Mice
-#ums*	at uhidev? reportid ?
-#wsmouse*	at ums?
-
-# USB Keyboards
-ukbd*	at uhidev? reportid ?
-wskbd*	at ukbd? console ?
-
-# USB serial adapter
-#ucycom*	at uhidev? reportid ?
-
-# USB Generic HID devices
-#uhid*	at uhidev? reportid ?
-
-# USB Printer
-#ulpt*	at uhub? port ? configuration ? interface ?
-
-# USB Mass Storage
-umass*	at uhub? port ? configuration ? interface ?
-
-# Y@P firmware loader
-#uyap* at uhub? port ?
-
-# USB Generic driver
-#ugen*	at uhub? port ? configuration ? interface ?
-
-# USB Ethernet adapters
-#atu*	at uhub? port ?		# Atmel AT76C50XX based adapters
-aue* 	at uhub? port ?		# ADMtek AN986 Pegasus based adapters
-axe*	at uhub? port ?		# ASIX AX88172 based adapters
-cue* 	at uhub? port ?		# CATC USB-EL1201A based adapters
-kue* 	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
-url*	at uhub? port ?		# Realtek RTL8150L based adapters
-
-# Audio Devices
-
-# PCI audio devices
-#eap*	at pci? dev ? function ?	# Ensoniq AudioPCI
-#eso*	at pci? dev ? function ?	# ESS Solo-1 PCI AudioDrive
-#sv*	at pci? dev ? function ?	# S3 SonicVibes
-
-# ISA Plug-and-Play audio devices
-#guspnp*	at isapnp?			# Gravis Ultra Sound PnP audio
-#sb*	at isapnp?			# SoundBlaster-compatible audio
-
-# ISA audio devices
-# the "aria" probe might give false hits
-#aria0	at isa? port 0x290 irq 10 		# Aria
-#gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis Ultra Sound
-#pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
-#sb0	at isa? port 0x220 irq 7 drq 1 drq2 5	# SoundBlaster
-#wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System
-
-# OPL[23] FM synthesizers
-#opl0	at isa? port 0x388	# use only if not attached to sound card
-#opl*	at eso?
-#opl*	at ess?
-#opl*	at sb?
-#opl*	at sv?
-
-# Audio support
-#audio*	at audiobus?
-
-# MIDI support
-#midi*	at midibus?
-#midi*	at pcppi?		# MIDI interface to the PC speaker
-
-# The spkr driver provides a simple tone interface to the built in speaker.
-#spkr0	at pcppi?		# PC speaker
-
-
-# Mice
-
-# ISA busmice
-#lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
-#lms1	at isa? port 0x238 irq 5
-#mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
-#mms1	at isa? port 0x238 irq 5
-#wsmouse*	at lms?
-#wsmouse*	at mms?
-
-# Joysticks
-
-# ISA Plug-and-Play joysticks
-#joy*	at isapnp?			# Game ports (usually on audio cards)
-
-# ISA joysticks. Probe is a little strange; add only if you have one.
-#joy0	at isa? port 0x201
-
-
-# Miscellaneous Devices
-
-# Planetconnect Satellite receiver driver.
-#satlink0 at isa? port 0x300 drq 1
-
-
-# Pull in optional local configuration
-cinclude "arch/i386/conf/INSTALL.local"
-
-
-# Pseudo-Devices
-
-# disk/mass storage pseudo-devices
-#pseudo-device	ccd		4	# concatenated/striped disk devices
-pseudo-device	raid		8	# RAIDframe disk driver
-options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
-#pseudo-device	fss		4	# file system snapshot device
-pseudo-device	md		1	# memory disk device (ramdisk)
-#pseudo-device	vnd			# disk-like interface to files
-
-# network pseudo-devices
-pseudo-device	bpfilter		# Berkeley packet filter
-#pseudo-device	ipfilter		# IP filter (firewall) and NAT
-pseudo-device	loop			# network loopback
-#pseudo-device	ppp			# Point-to-Point Protocol
-pseudo-device	sl			# Serial Line IP
-#pseudo-device	strip			# Starmode Radio IP (Metricom)
-#pseudo-device	tun			# network tunneling over tty
-#pseudo-device	gre			# generic L3 over IP tunnel
-
-# miscellaneous pseudo-devices
-pseudo-device	pty		2	# pseudo-terminals (Sysinst needs two)
-options NO_DEV_PTM
-#pseudo-device	sequencer	1	# MIDI sequencer
-# rnd works; RND_COM does not on port i386 yet.
-pseudo-device	rnd			# /dev/random and in-kernel generator
-#options 	RND_COM			# use "com" randomness as well (BROKEN)
-
-# a pseudo device needed for Coda	# also needs CODA (above)
-#pseudo-device	vcoda		4	# coda minicache <-> venus comm.
-
-# wscons pseudo-devices
-pseudo-device	wsmux			# mouse & keyboard multiplexor
-#pseudo-device	wsfont
-
+options 	MEMORY_DISK_IS_ROOT     # force root on memory disk
+options 	MEMORY_DISK_SERVER=0    # no userspace memory disk support
+options 	MEMORY_DISK_ROOT_SIZE=10000     # size of memory disk, in blocks
diff --git a/sys/arch/i386/conf/INSTALL_FLOPPY b/sys/arch/i386/conf/INSTALL_FLOPPY
new file mode 100644
index 000000000000..5e9460f118d4
--- /dev/null
+++ b/sys/arch/i386/conf/INSTALL_FLOPPY
@@ -0,0 +1,783 @@
+#	$NetBSD: INSTALL_FLOPPY,v 1.1 2008/04/30 15:29:11 ad Exp $
+#
+#	INSTALL - Installation kernel.
+#
+#	This kernel should be derived from GENERIC with some features
+#	commented out.
+#
+#	This kernel does NOT support X, mice, audio devices, non-NetBSD
+#	emulation.
+#
+
+include "arch/i386/conf/std.i386"
+
+#options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
+
+makeoptions 	CPUFLAGS="-march=i486 -mtune=i486"	# i486 is densest code
+makeoptions 	COPTS="-Os"
+makeoptions 	USE_SSP="no"
+
+# Enable the hooks used for initializing the root memory-disk.
+options 	MEMORY_DISK_HOOKS
+options 	MEMORY_DISK_IS_ROOT	# force root on memory disk
+options 	MEMORY_DISK_SERVER=0	# no userspace memory disk support
+options 	MEMORY_DISK_ROOT_SIZE=10000	# size of memory disk, in blocks
+
+maxusers	2		# estimated number of users
+
+# CPU-related options.
+#options 	VM86		# virtual 8086 emulation
+#options 	USER_LDT	# user-settable LDT; used by WINE
+
+# This option allows you to force a serial console at the specified
+# I/O address.
+#options 	CONSDEVNAME="\"com\"",CONADDR=0x3f8,CONSPEED=9600
+
+# The following options override the memory sizes passed in from the boot
+# block.  Use them *only* if the boot block is unable to determine the correct
+# values.  Note that the BIOS may *correctly* report less than 640k of base
+# memory if the extended BIOS data area is located at the top of base memory
+# (as is the case on most recent systems).
+#options 	REALBASEMEM=...	# size of base memory
+#options 	REALEXTMEM=...	# size of extended memory
+
+# Avoid irq 5 and 7, the most likely cause of problems on modern laptops.
+options 		PCIC_ISA_INTR_ALLOC_MASK=0xff5f
+
+# Standard system options
+
+options 	INSECURE	# disable kernel security levels
+
+options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
+#options 	NTP		# NTP phase/frequency locked loop
+
+#options 	KTRACE		# system call tracing via ktrace(1)
+
+#options 	SYSVMSG		# System V-like message queues
+#options 	SYSVSEM		# System V-like semaphores
+#options 	SYSVSHM		# System V-like memory sharing
+#options 	SHMMAXPGS=2048	# 2048 pages is the default
+
+#options 	LKM		# loadable kernel modules
+
+options 	USERCONF	# userconf(4) support
+options 	PIPE_SOCKETPAIR		# smaller, but slower pipe(2)
+#options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
+no options 	EXEC_AOUT
+
+no options 	RFC2292		# Previous version of Adv. Sockets API for IPv6
+no options 	PTRACE		# Include ptrace(2)
+
+# Diagnostic/debugging support options
+#options 	DIAGNOSTIC	# expensive kernel consistency checks
+#options 	DEBUG		# expensive debugging checks/support
+#options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
+options 	DDB		# in-kernel debugger
+#options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
+#options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
+#options 	KGDB		# remote debugger
+#options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
+#makeoptions 	DEBUG="-g"	# compile full symbol table
+
+# Compatibility options
+#options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
+#options 	COMPAT_09	# NetBSD 0.9
+#options 	COMPAT_10	# NetBSD 1.0
+#options 	COMPAT_11	# NetBSD 1.1
+#options 	COMPAT_12	# NetBSD 1.2, 386BSD, and BSDI
+#options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
+#options 	COMPAT_14	# NetBSD 1.4
+#options 	COMPAT_15	# NetBSD 1.5
+#options 	COMPAT_16	# NetBSD 1.6
+options 	COMPAT_20	# NetBSD 2.0
+options 	COMPAT_30	# NetBSD 3.0 compatibility.
+options 	COMPAT_40	# NetBSD 4.0
+#options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
+#options 	COMPAT_386BSD_MBRPART # recognize old partition ID
+#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
+
+#options 	COMPAT_SVR4	# binary compatibility with SVR4
+#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
+#options 	COMPAT_LINUX	# binary compatibility with Linux
+#options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
+options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
+
+# File systems
+file-system 	FFS		# UFS
+file-system 	EXT2FS		# second extended file system (linux)
+#file-system 	LFS		# log-structured file system
+file-system 	MFS		# memory file system
+file-system 	NFS		# Network File System client
+file-system 	NTFS		# Windows/NT Filesystem
+file-system 	CD9660		# ISO 9660 + Rock Ridge file system
+file-system 	MSDOSFS		# MS-DOS file system
+#file-system 	FDESC		# /dev/fd
+#file-system 	KERNFS		# /kern
+#file-system 	NULLFS		# loopback file system
+#file-system 	PORTAL		# portal filesystem (still experimental)
+#file-system 	PROCFS		# /proc
+#file-system 	UMAPFS		# NULLFS + uid and gid remapping
+#file-system 	UNION		# union file system
+#file-system 	PTYFS		# /dev/pts/N support
+#file-system 	TMPFS		# Efficient memory file-system
+
+# Filesystem options
+#options 	QUOTA		# UFS quotas
+#options 	NFSSERVER	# Network File System server
+options 	NFS_V2_ONLY	# Exclude NFS3 code to save space
+options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
+#options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
+				# immutable) behave as system flags.
+
+# Networking options
+#options 	GATEWAY		# packet forwarding
+options 	INET		# IP + ICMP + TCP + UDP
+options 	INET6		# IPv6
+#options 	MROUTING	# IP multicast routing
+#options 	PIM		# Protocol Independent Multicast
+#options 	ISO,TPIP	# OSI
+#options 	EON		# OSI tunneling over IP
+#options 	NETATALK	# AppleTalk networking protocols
+#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
+#options 	PPP_DEFLATE	# Deflate compression support for PPP
+#options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
+#options 	PFIL_HOOKS	# pfil(9) packet filter hooks
+#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
+
+# These options enable verbose messages for several subsystems.
+# Warning, these may compile large string tables into the kernel!
+#options 	EISAVERBOSE	# verbose EISA device autoconfig messages
+#options 	MIIVERBOSE	# verbose PHY autoconfig messages
+#options 	PCIVERBOSE	# verbose PCI device autoconfig messages
+#options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
+#options 	PCMCIAVERBOSE	# verbose PCMCIA configuration messages
+#options 	SCSIVERBOSE	# human readable SCSI error messages
+
+#
+# wscons options
+#
+# builtin terminal emulations 
+#options 	WSEMUL_SUN		# sun terminal emulation
+options 	WSEMUL_VT100		# VT100 / VT220 emulation
+# customization of console and kernel output - see dev/wscons/wsdisplayvar.h
+#options 	WSDISPLAY_CUSTOM_OUTPUT	# color customization from wsconsctl(8)
+#options 	WS_DEFAULT_FG=WSCOL_WHITE
+#options 	WS_DEFAULT_BG=WSCOL_BLACK
+#options 	WS_DEFAULT_COLATTR="(0)"
+#options 	WS_DEFAULT_MONOATTR="(0)"
+#options 	WS_KERNEL_FG=WSCOL_GREEN
+#options 	WS_KERNEL_BG=WSCOL_BLACK
+#options 	WS_KERNEL_COLATTR=""
+#options 	WS_KERNEL_MONOATTR=""
+# customization of console border color
+#options 	WSDISPLAY_CUSTOM_BORDER	# border customization from wsconsctl(8)
+#options 	WSDISPLAY_BORDER_COLOR=WSCOL_BLUE	# default color
+# compatibility to other console drivers
+#options 	WSDISPLAY_COMPAT_PCVT           # emulate some ioctls
+#options 	WSDISPLAY_COMPAT_SYSCONS        # emulate some ioctls
+#options 	WSDISPLAY_COMPAT_USL            # VT handling
+#options 	WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
+# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
+#options 	PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
+# allocate a number of virtual screens at autoconfiguration time
+#options 	WSDISPLAY_DEFAULTSCREENS=4
+# use a large software cursor that doesn't blink
+options 	PCDISPLAY_SOFTCURSOR
+# modify the screen type of the console; defaults to "80x25"
+#options 	VGA_CONSOLE_SCREENTYPE="\"80x24\""
+
+# Kernel root file system and dump configuration.
+config		netbsd	root on ? type ?
+#config		netbsd	root on sd0a type ffs
+#config		netbsd	root on ? type nfs
+
+#
+# Device configuration
+#
+
+mainbus0 at root
+
+cpu* at mainbus?
+
+#apm0	at mainbus0			# Advanced power management
+
+
+# Basic Bus Support
+
+# PCI bus support
+pci*	at mainbus? bus ?
+pci*	at pchb? bus ?
+pci*	at ppb? bus ?
+
+# PCI bridges
+pchb*	at pci? dev ? function ?	# PCI-Host bridges
+pceb*	at pci? dev ? function ?	# PCI-EISA bridges
+pcib*	at pci? dev ? function ?	# PCI-ISA bridges
+ppb*	at pci? dev ? function ?	# PCI-PCI bridges
+# XXX 'puc's aren't really bridges, but there's no better place for them here
+#puc*	at pci? dev ? function ?	# PCI "universal" comm. cards
+
+# EISA bus support
+eisa0	at mainbus?
+eisa0	at pceb?
+
+# ISA bus support
+isa0	at mainbus?
+isa0	at pceb?
+isa0	at pcib?
+
+# PCMCIA bus support
+pcmcia*	at pcic? controller ? socket ?
+pcmcia*	at tcic? controller ? socket ?
+
+# ISA PCMCIA controllers
+pcic0 	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
+pcic1 	at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
+pcic2	at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
+tcic0 	at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
+
+# PCI PCMCIA controllers
+pcic0	at pci? dev? function ?
+
+# ISA Plug-and-Play bus support
+isapnp0	at isa?
+
+# ISA Plug-and-Play PCMCIA controllers
+pcic*	at isapnp?
+
+# Coprocessor Support
+
+# Math Coprocessor support
+npx0	at isa? port 0xf0 irq 13	# x86 math coprocessor
+
+
+# Console Devices
+
+# wscons
+pckbc0		at isa?			# pc keyboard controller
+pckbd*		at pckbc?		# PC keyboard
+#pms*		at pckbc?		# PS/2 mouse for wsmouse
+vga0		at isa?
+vga*		at pci? dev ? function ?
+pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
+wsdisplay*	at vga? console ?
+wsdisplay*	at pcdisplay? console ?
+wskbd*		at pckbd? console ?
+#wsmouse*	at pms? mux 0
+
+#attimer0	at isa?
+#pcppi0		at isa?
+#sysbeep0	at pcppi?
+
+# Serial Devices
+
+# PCI serial interfaces
+#com*	at puc? port ?			# 16x50s on "universal" comm boards
+#cy*	at pci? dev ? function ?	# Cyclades Cyclom-Y serial boards
+
+# ISA Plug-and-Play serial interfaces
+com*	at isapnp?			# Modems and serial boards
+
+# PCMCIA serial interfaces
+com*	at pcmcia? function ?		# Modems and serial cards
+
+pcmcom*	at pcmcia? function ?		# PCMCIA multi-port serial cards
+com*	at pcmcom? slave ?		# ...and the slave devices
+
+# ISA serial interfaces
+#options 	COM_HAYESP		# adds Hayes ESP serial board support
+com0	at isa? port 0x3f8 irq 4	# Standard PC serial ports
+com1	at isa? port 0x2f8 irq 3
+com2	at isa? port 0x3e8 irq 5
+#com3	at isa? port 0x2e8 irq 9
+#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
+#com*	at ast? slave ?
+#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
+#com*	at boca? slave ?
+#tcom0	at isa? port 0x100 irq 7	# TC-800 8-port serial cards
+#com*	at tcom? slave ?
+#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
+#com*	at rtfps? slave ?
+#cy0	at isa? iomem 0xd4000 irq 12	# Cyclades serial cards
+
+
+# Parallel Printer Interfaces
+
+# PCI parallel printer interfaces
+#lpt*	at puc? port ?			# || ports on "universal" comm boards
+
+# ISA parallel printer interfaces
+#lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
+#lpt1	at isa? port 0x278
+#lpt2	at isa? port 0x3bc
+
+# I2O devices
+iop*	at pci? dev ? function ?	# I/O processor
+iopsp*	at iop? tid ?			# SCSI/FC-AL ports
+ld*	at iop? tid ?			# Block devices
+#dpti*	at iop? tid 0			# DPT/Adaptec control interface
+
+# SCSI Controllers and Devices
+
+# PCI SCSI controllers
+adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
+adw*	at pci? dev ? function ?	# AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
+ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
+ahd*	at pci? dev ? function ?	# Adaptec 29320, 39320 (aic790x) SCSI
+bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
+dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID
+iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
+mfi*	at pci? dev ? function ?	# LSI MegaRAID SAS
+mly*	at pci? dev ? function ?	# Mylex AcceleRAID and eXtremeRAID
+mpt*	at pci? dev ? function ?	# LSI Fusion SCSI/FC
+pcscp*	at pci? dev ? function ?	# AMD 53c974 PCscsi-PCI SCSI
+siop*	at pci? dev ? function ?	# NCR 53c8xx SCSI (new driver)
+trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI
+
+# EISA SCSI controllers
+ahb*	at eisa? slot ?			# Adaptec 174[02] SCSI
+ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI
+bha*	at eisa? slot ?			# BusLogic 7xx SCSI
+dpt*	at eisa? slot ?			# DPT SmartCache/SmartRAID
+uha*	at eisa? slot ?			# UltraStor 24f SCSI
+
+# PCMCIA SCSI controllers
+aic*	at pcmcia? function ?		# Adaptec APA-1460 SCSI
+
+# ISA Plug-and-Play SCSI controllers
+aha*	at isapnp? 			# Adaptec AHA-154[02
+aic*	at isapnp?			# Adaptec AHA-1520B
+
+# ISA SCSI controllers
+adv0	at isa? port ? irq ? drq ?	# AdvanSys APB-514[02]
+aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI
+aha1	at isa? port 0x334 irq ? drq ?
+ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI
+aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI
+bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [457]4X SCSI
+bha1	at isa? port 0x334 irq ? drq ?
+# The "nca" and "dpt" probes might give false hits or hang your machine.
+#dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
+#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
+#nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
+sea0	at isa? iomem 0xc8000 irq 5	# Seagate/Future Domain SCSI
+uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI
+uha1	at isa? port 0x340 irq ? drq ?
+wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
+wds1	at isa? port 0x358 irq 11 drq 5
+
+# SCSI bus support
+scsibus* at scsi?
+
+# SCSI devices
+sd*	at scsibus? target ? lun ?	# SCSI disk drives
+st*	at scsibus? target ? lun ?	# SCSI tape drives
+cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
+#ch*	at scsibus? target ? lun ?	# SCSI autochangers
+#ss*	at scsibus? target ? lun ?	# SCSI scanners
+#uk*	at scsibus? target ? lun ?	# SCSI unknown
+
+
+# RAID controllers and devices
+aac*	at pci? dev ? function ?	# Adaptec AAC family
+amr*	at pci? dev ? function ?	# AMI/LSI Logic MegaRAID
+cac*	at eisa? slot ?			# Compaq EISA array controllers
+cac*	at pci? dev ? function ?	# Compaq PCI array controllers
+ciss*	at pci? dev ? function ?	# HP Smart Array controllers
+icp*	at pci? dev ? function ?	# ICP-Vortex GDT & Intel RAID
+mlx*	at pci? dev ? function ?	# Mylex DAC960 & DEC SWXCR family
+mlx*	at eisa? slot ?			# Mylex DAC960 & DEC SWXCR family
+twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers
+twa*	at pci? dev ? function ?	# 3ware Escalade 95xx RAID controllers
+
+ld*	at aac? unit ?			# logical disk devices
+ld*	at amr? unit ?
+ld*	at cac? unit ?
+ld*	at icp? unit ?
+ld*	at twe? unit ?
+ld*	at twa? unit ?
+ld*	at mlx? unit ?
+
+icpsp*	at icp? unit ?			# SCSI pass-through
+
+# IDE and related devices
+# PCI IDE controllers - see pciide(4) for supported hardware.
+# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
+# how to set up DMA modes for this chip. This may work, or may cause
+# a machine hang with some controllers.
+pciide* 	at pci? dev ? function ? flags 0x0000	# GENERIC pciide driver
+acardide*	at pci? dev ? function ?	# Acard IDE controllers
+aceride* 	at pci? dev ? function ?	# Acer Lab IDE controllers
+#ahcisata* 	at pci? dev ? function ?	# AHCI SATA controllers
+artsata*	at pci? dev ? function ?	# Intel i31244 SATA controller
+cmdide* 	at pci? dev ? function ?	# CMD tech IDE controllers
+cypide* 	at pci? dev ? function ?	# Cypress IDE controllers
+geodeide* 	at pci? dev ? function ?	# AMD Geode IDE controllers
+hptide* 	at pci? dev ? function ?	# Triones/HighPoint IDE controllers
+iteide* 	at pci? dev ? function ?	# IT Express IDE controllers
+#ixpide*		at pci? dev ? function ?	# ATI IXP IDE controllers
+optiide* 	at pci? dev ? function ?	# Opti IDE controllers
+piixide* 	at pci? dev ? function ?	# Intel IDE controllers
+pdcide* 	at pci? dev ? function ?	# Promise IDE controllers
+pdcsata*	at pci? dev ? function ?	# Promise SATA150 controllers
+rccide* 	at pci? dev ? function ?	# ServerWorks IDE controllers
+satalink*	at pci? dev ? function ?	# SiI SATALink controllers
+siside* 	at pci? dev ? function ?	# SiS IDE controllers
+slide* 		at pci? dev ? function ?	# Symphony Labs IDE controllers
+#svwsata* 	at pci? dev ? function ?	# ServerWorks SATA controllers
+viaide* 	at pci? dev ? function ?	# VIA/AMD/Nvidia IDE controllers
+stpcide*	at pci? dev ? function ?	# STMicro STPC IDE controllers
+
+# ISA Plug-and-Play IDE controllers
+wdc*	at isapnp?
+
+# PCMCIA IDE controllers
+wdc*	at pcmcia? function ?
+
+# ISA ST506, ESDI, and IDE controllers
+# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
+# fall back to 16bits I/O if 32bits I/O are not functional).
+# Some controllers pass the initial 32bit test, but will fail later.
+wdc0	at isa? port 0x1f0 irq 14 flags 0x00
+wdc1	at isa? port 0x170 irq 15 flags 0x00
+
+# ATA (IDE) bus support
+atabus* at ata?
+
+# IDE drives
+# Flags are used only with controllers that support DMA operations
+# and mode settings (e.g. some pciide controllers)
+# The lowest order four bits (rightmost digit) of the flags define the PIO
+# mode to use, the next set of four bits the DMA mode and the third set the
+# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode
+# to use, and the last bit must be 1 for this setting to be used.
+# For DMA and UDMA, 0xf (1111) means 'disable'.
+# 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
+# (0xc=1100, 0xa=1010, 0xf=1111)
+# 0x0000 means "use whatever the drive claims to support".
+wd*	at atabus? drive ? flags 0x0000
+
+# ATA RAID configuration support, as found on some Promise controllers.
+pseudo-device	ataraid
+ld*	at ataraid? vendtype ? unit ?
+
+# ATAPI bus support
+atapibus* at atapi?
+
+# ATAPI devices
+# flags have the same meaning as for IDE drives.
+cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
+sd*	at atapibus? drive ? flags 0x0000	# ATAPI disk drives
+st*	at atapibus? drive ? flags 0x0000	# ATAPI tape drives
+#uk*	at atapibus? drive ? flags 0x0000	# ATAPI unknown
+
+
+# Miscellaneous mass storage devices
+
+# ISA floppy
+fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
+#fdc1	at isa? port 0x370 irq ? drq ?
+fd*	at fdc? drive ?			# the drives themselves
+# some machines need you to do this instead of fd*
+#fd0	at fdc0 drive 0
+
+# ISA CD-ROM devices
+#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
+
+# ISA tape devices
+# note: the wt driver conflicts unpleasantly with ed devices at the
+# same I/O address. The probe reprograms their EEPROMs. Don't
+# uncomment it unless you are actually using it.
+#wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives
+
+
+# Network Interfaces
+
+# PCI network interfaces
+an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
+ath*	at pci? dev ? function ?	# Atheros 5210/5211/5212 802.11
+atw*	at pci? dev ? function ?	# ADMtek ADM8211 (802.11)
+bce* 	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
+bge* 	at pci? dev ? function ?	# Broadcom 570x Gigabit Ethernet
+# bnx* 	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
+#en*	at pci? dev ? function ?	# ENI/Adaptec ATM
+ep*	at pci? dev ? function ?	# 3Com 3c59x
+ex*	at pci? dev ? function ?	# 3Com 90x[BC]
+epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
+#esh*	at pci? dev ? function ?	# Essential HIPPI card
+fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI
+fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
+gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
+#hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
+#ipw*	at pci? dev ? function ?	# Intel PRO/Wireless 2100
+#iwi*	at pci? dev ? function ?	# Intel PRO/Wireless 2200BG
+#le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
+lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
+#lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
+mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
+msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet
+mtd*	at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
+ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
+#nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
+#ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
+pcn*	at pci? dev ? function ?	# AMD PCnet-PCI Ethernet
+re*	at pci? dev ? function ?	# Realtek 8139C+/8169/8169S/8110S
+rtk*	at pci? dev ? function ?	# Realtek 8129/8139
+sf*	at pci? dev ? function ?	# Adaptec AIC-6915 Ethernet
+sip*	at pci? dev ? function ?	# SiS 900/DP83815 Ethernet
+skc*	at pci? dev ? function ?	# SysKonnect SK9821 Gigabit Ethernet
+sk*	at skc?				# SysKonnect SK9821 Gigabit Ethernet
+ste*	at pci? dev ? function ?	# Sundance ST-201 Ethernet
+stge*	at pci? dev ? function ?	# Sundance/Tamarack TC9021 Gigabit
+ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet
+tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
+tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones
+#txp*	at pci? dev ? function ?	# 3com 3cr990
+#vge*	at pci? dev ? function ?	# VIATech VT612X Gigabit Ethernet
+vr*	at pci? dev ? function ?	# VIA Rhine Fast Ethernet
+wi*	at pci? dev ? function ?	# Intersil Prism Mini-PCI (802.11b)
+wm*	at pci? dev ? function ?	# Intel 8254x gigabit
+
+# EISA network interfaces
+ep*	at eisa? slot ?			# 3Com 3c579 Ethernet
+fea*	at eisa? slot ?			# DEC DEFEA FDDI
+tlp*	at eisa? slot ?			# DEC DE-425 Ethernet
+
+# ISA Plug-and-Play network interfaces
+an*	at isapnp?			# # Aironet 802.11
+ep*	at isapnp?			# 3Com 3c509 Ethernet
+fmv*	at isapnp?			# Fujitsu FMV-183
+le*	at isapnp?			# AMD PCnet-ISA Ethernet
+ne*	at isapnp?			# NE2000-compatible Ethernet
+tr*	at isapnp?			# IBM/3COM TROPIC Token-Ring
+
+# PCMCIA network interfaces
+an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11)
+awi*	at pcmcia? function ?		# BayStack 650 (802.11FH)
+cnw*	at pcmcia? function ?		# Xircom/Netwave AirSurfer
+cs*	at pcmcia? function ?		# CS89xx Ethernet
+ep*	at pcmcia? function ?		# 3Com 3c589 and 3c562 Ethernet
+mbe*	at pcmcia? function ?		# MB8696x based Ethernet
+ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
+ray* 	at pcmcia? function ?		# Raytheon Raylink (802.11)
+sm*	at pcmcia? function ?		# Megahertz Ethernet
+wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
+options 	WI_PCMCIA_SPECTRUM24T_FW=0
+xirc*	at pcmcia? function ?		# Xircom CreditCard Ethernet
+com*	at xirc?
+xi*	at xirc?
+mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
+com*	at mhzc?
+sm*	at mhzc?
+
+# ISA network interfaces
+ate0	at isa? port 0x2a0 irq ?		# AT1700
+cs0	at isa? port 0x300 iomem ? irq ? drq ?	# CS8900 Ethernet
+ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3Com 3c503 Ethernet
+eg0	at isa? port 0x280 irq 9		# 3C505 ethernet cards
+el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
+ep*	at isa? port ? irq ?			# 3C509 ethernet cards
+ef0	at isa? port 0x360 iomem 0xd0000 irq 7	# 3C507
+ai0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN
+fmv0	at isa? port 0x2a0 irq ?		# FMV-181/182
+ix0	at isa? port 0x300 irq 10		# EtherExpress/16
+iy0	at isa? port 0x360 irq ?		# EtherExpress PRO 10 ISA
+lc0	at isa? port 0x320 iomem ? irq ?	# DEC EtherWORKS III (LEMAC)
+depca0	at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5	# DEPCA
+le*	at depca?
+nele0	at isa? port 0x320 irq 9 drq 7		# NE2100
+le*	at nele?
+bicc0	at isa? port 0x320 irq 10 drq 7		# BICC IsoLan
+le*	at bicc?
+ne0	at isa? port 0x280 irq 9		# NE[12]000 ethernet cards
+ne1	at isa? port 0x300 irq 10
+sm0	at isa? port 0x300 irq 10		# SMC91C9x Ethernet
+tr0	at isa? port 0xa20 iomem 0xd8000 irq ?	# IBM TROPIC based Token-Ring
+tr1	at isa? port 0xa24 iomem 0xd0000 irq ?	# IBM TROPIC based Token-Ring
+tr*	at isa? port ? irq ?			# 3COM TROPIC based Token-Ring
+we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC Ethernet
+we1	at isa? port 0x300 iomem 0xcc000 irq 10
+
+# MII/PHY support
+acphy*	at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
+amhphy* at mii? phy ?			# AMD 79c901 Ethernet PHYs
+bmtphy* at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
+brgphy* at mii? phy ?			# Broadcom BCM5400-family PHYs
+#ciphy*	at mii? phy ?			# Cicada CS8201 Gig-E PHYs
+dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
+exphy*	at mii? phy ?			# 3Com internal PHYs
+glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
+gphyter* at mii? phy ?			# NS83861 Gig-E PHY
+icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS189x
+igphy*	at mii? phy ?			# Intel IGP01E1000
+ikphy*	at mii? phy ?			# Intel 82563 PHYs
+inphy*	at mii? phy ?			# Intel 82555 PHYs
+iophy*	at mii? phy ?			# Intel 82553 PHYs
+lxtphy*	at mii? phy ?			# Level One LXT-970 PHYs
+makphy*	at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
+nsphy*	at mii? phy ?			# NS83840 PHYs
+nsphyter* at mii? phy ?			# NS83843 PHYs
+pnaphy* at mii? phy ?			# generic HomePNA PHYs
+qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
+rgephy*	at mii? phy ?			# Realtek 8169S/8110S internal PHYs
+rlphy*	at mii? phy ?			# Realtek 8139/8201L PHYs
+sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
+tlphy*	at mii? phy ?			# ThunderLAN PHYs
+tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
+urlphy*	at mii? phy ?			# Realtek RTL8150L internal PHYs
+ukphy*	at mii? phy ?			# generic unknown PHYs
+
+# USB Controller and Devices
+
+# PCI USB controllers
+ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
+uhci*	at pci?				# Universal Host Controller (Intel)
+ohci*	at pci?				# Open Host Controller
+
+# USB bus support
+usb*	at ehci?
+usb*	at uhci?
+usb*	at ohci?
+
+# USB Hubs
+uhub*	at usb?
+uhub*	at uhub? port ?
+
+# USB HID device
+uhidev*	at uhub? port ? configuration ? interface ?
+
+# USB Mice
+#ums*	at uhidev? reportid ?
+#wsmouse*	at ums?
+
+# USB Keyboards
+ukbd*	at uhidev? reportid ?
+wskbd*	at ukbd? console ?
+
+# USB serial adapter
+#ucycom*	at uhidev? reportid ?
+
+# USB Generic HID devices
+#uhid*	at uhidev? reportid ?
+
+# USB Printer
+#ulpt*	at uhub? port ? configuration ? interface ?
+
+# USB Mass Storage
+umass*	at uhub? port ? configuration ? interface ?
+
+# Y@P firmware loader
+#uyap* at uhub? port ?
+
+# USB Generic driver
+#ugen*	at uhub? port ? configuration ? interface ?
+
+# USB Ethernet adapters
+#atu*	at uhub? port ?		# Atmel AT76C50XX based adapters
+aue* 	at uhub? port ?		# ADMtek AN986 Pegasus based adapters
+axe*	at uhub? port ?		# ASIX AX88172 based adapters
+cue* 	at uhub? port ?		# CATC USB-EL1201A based adapters
+kue* 	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
+url*	at uhub? port ?		# Realtek RTL8150L based adapters
+
+# Audio Devices
+
+# PCI audio devices
+#eap*	at pci? dev ? function ?	# Ensoniq AudioPCI
+#eso*	at pci? dev ? function ?	# ESS Solo-1 PCI AudioDrive
+#sv*	at pci? dev ? function ?	# S3 SonicVibes
+
+# ISA Plug-and-Play audio devices
+#guspnp*	at isapnp?			# Gravis Ultra Sound PnP audio
+#sb*	at isapnp?			# SoundBlaster-compatible audio
+
+# ISA audio devices
+# the "aria" probe might give false hits
+#aria0	at isa? port 0x290 irq 10 		# Aria
+#gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis Ultra Sound
+#pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
+#sb0	at isa? port 0x220 irq 7 drq 1 drq2 5	# SoundBlaster
+#wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System
+
+# OPL[23] FM synthesizers
+#opl0	at isa? port 0x388	# use only if not attached to sound card
+#opl*	at eso?
+#opl*	at ess?
+#opl*	at sb?
+#opl*	at sv?
+
+# Audio support
+#audio*	at audiobus?
+
+# MIDI support
+#midi*	at midibus?
+#midi*	at pcppi?		# MIDI interface to the PC speaker
+
+# The spkr driver provides a simple tone interface to the built in speaker.
+#spkr0	at pcppi?		# PC speaker
+
+
+# Mice
+
+# ISA busmice
+#lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
+#lms1	at isa? port 0x238 irq 5
+#mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
+#mms1	at isa? port 0x238 irq 5
+#wsmouse*	at lms?
+#wsmouse*	at mms?
+
+# Joysticks
+
+# ISA Plug-and-Play joysticks
+#joy*	at isapnp?			# Game ports (usually on audio cards)
+
+# ISA joysticks. Probe is a little strange; add only if you have one.
+#joy0	at isa? port 0x201
+
+
+# Miscellaneous Devices
+
+# Planetconnect Satellite receiver driver.
+#satlink0 at isa? port 0x300 drq 1
+
+
+# Pull in optional local configuration
+cinclude "arch/i386/conf/INSTALL.local"
+
+
+# Pseudo-Devices
+
+# disk/mass storage pseudo-devices
+#pseudo-device	ccd		4	# concatenated/striped disk devices
+pseudo-device	raid		8	# RAIDframe disk driver
+options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
+#pseudo-device	fss		4	# file system snapshot device
+pseudo-device	md		1	# memory disk device (ramdisk)
+#pseudo-device	vnd			# disk-like interface to files
+
+# network pseudo-devices
+pseudo-device	bpfilter		# Berkeley packet filter
+#pseudo-device	ipfilter		# IP filter (firewall) and NAT
+pseudo-device	loop			# network loopback
+#pseudo-device	ppp			# Point-to-Point Protocol
+pseudo-device	sl			# Serial Line IP
+#pseudo-device	strip			# Starmode Radio IP (Metricom)
+#pseudo-device	tun			# network tunneling over tty
+#pseudo-device	gre			# generic L3 over IP tunnel
+
+# miscellaneous pseudo-devices
+pseudo-device	pty		2	# pseudo-terminals (Sysinst needs two)
+options NO_DEV_PTM
+#pseudo-device	sequencer	1	# MIDI sequencer
+# rnd works; RND_COM does not on port i386 yet.
+pseudo-device	rnd			# /dev/random and in-kernel generator
+#options 	RND_COM			# use "com" randomness as well (BROKEN)
+
+# a pseudo device needed for Coda	# also needs CODA (above)
+#pseudo-device	vcoda		4	# coda minicache <-> venus comm.
+
+# wscons pseudo-devices
+pseudo-device	wsmux			# mouse & keyboard multiplexor
+#pseudo-device	wsfont
+
diff --git a/sys/arch/i386/conf/INSTALL_LARGE b/sys/arch/i386/conf/INSTALL_LARGE
deleted file mode 100644
index 085669d8ad8f..000000000000
--- a/sys/arch/i386/conf/INSTALL_LARGE
+++ /dev/null
@@ -1,40 +0,0 @@
-#	$NetBSD: INSTALL_LARGE,v 1.12 2008/01/07 08:39:06 martti Exp $
-#
-#	INSTALL_LARGE -- INSTALL suitable for modern machines
-#
-
-include "arch/i386/conf/INSTALL"
-
-acpi0 		at mainbus0
-
-#options 	ACPI_ACTIVATE_DEV	# If set, activate inactive devices
-#options 	ACPICA_PEDANTIC		# force strict conformance to the Spec.
-options 	ACPIVERBOSE
-options 	ACPI_SCANPCI
-
-ioapic* 	at mainbus?
-bnx* 	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
-ral*	at pci? dev ? function ?	# Ralink Technology RT25x0 802.11a/b/g
-txp*	at pci? dev ? function ?	# 3com 3cr990
-vge*	at pci? dev ? function ?	# VIATech VT612X Gigabit Ethernet
-nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
-jmide* 	at pci? dev ? function ? 	# JMicron PCI-e PATA/SATA controllers
-ahcisata* at jmide?
-ahcisata* 	at pci? dev ? function ?	# AHCI SATA controllers
-ixpide*		at pci? dev ? function ?	# ATI IXP IDE controllers
-gcscide* 	at pci? dev ? function ? 	# AMD CS5535 Companion IDE controllers
-svwsata* 	at pci? dev ? function ?	# ServerWorks SATA controllers
-isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
-arcmsr*	at pci? dev ? function ?	# Areca SATA RAID controllers
-
-puc*	at pci? dev ? function ?	# PCI "universal" comm. cards
-com*	at puc? port ?			# 16x50s on "universal" comm boards
-
-
-# CardBus bridge support
-cbb* 		at pci? dev ? function ?
-cardslot* 	at cbb?
-
-# CardBus bus support
-cardbus* 	at cardslot?
-pcmcia* 	at cardslot?
diff --git a/sys/arch/i386/conf/INSTALL_SMALL b/sys/arch/i386/conf/INSTALL_SMALL
index 29c7a907a969..388153f396af 100644
--- a/sys/arch/i386/conf/INSTALL_SMALL
+++ b/sys/arch/i386/conf/INSTALL_SMALL
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_SMALL,v 1.141 2008/03/27 21:13:29 gdt Exp $
+#	$NetBSD: INSTALL_SMALL,v 1.142 2008/04/30 15:29:11 ad Exp $
 #
 #	INSTALL_SMALL - Small Installation kernel.
 #
@@ -153,9 +153,6 @@ config		netbsd	root on ? type ?
 # Device configuration
 #
 
-mainbus0 at root
-cpu0 at mainbus0
-
 #apm0	at mainbus0			# Advanced power management
 
 
diff --git a/sys/arch/i386/conf/INSTALL_TINY b/sys/arch/i386/conf/INSTALL_TINY
index c7d61e5b43d9..9ba07e165dff 100644
--- a/sys/arch/i386/conf/INSTALL_TINY
+++ b/sys/arch/i386/conf/INSTALL_TINY
@@ -1,4 +1,4 @@
-#	$NetBSD: INSTALL_TINY,v 1.118 2008/03/27 21:13:29 gdt Exp $
+#	$NetBSD: INSTALL_TINY,v 1.119 2008/04/30 15:29:11 ad Exp $
 #
 #	This kernel should be derived from INSTALL (which is derived
 #	from GENERIC) with some features commented out.
@@ -190,8 +190,6 @@ options 	PCDISPLAY_SOFTCURSOR
 # Device configuration
 #
 
-mainbus0 at root
-cpu0	at mainbus0
 #apm0	at mainbus0			# Advanced power management
 
 
diff --git a/sys/arch/i386/conf/NET4501 b/sys/arch/i386/conf/NET4501
index 0c0d74f9ee13..1f68ca74ee7e 100644
--- a/sys/arch/i386/conf/NET4501
+++ b/sys/arch/i386/conf/NET4501
@@ -1,4 +1,4 @@
-# $NetBSD: NET4501,v 1.61 2008/04/08 20:30:17 dyoung Exp $
+# $NetBSD: NET4501,v 1.62 2008/04/30 15:29:12 ad Exp $
 #
 # NET4501 -- kernel configuration for a Soekris Engineering net4501
 # single-board computer.
@@ -10,7 +10,7 @@ include 	"arch/i386/conf/std.i386"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"NET4501-$Revision: 1.61 $"
+#ident 		"NET4501-$Revision: 1.62 $"
 
 maxusers	32		# estimated number of users
 
@@ -174,9 +174,6 @@ config		netbsd	root on ? type ?
 # Device configuration
 #
 
-mainbus0 at root
-cpu0 	at mainbus0
-
 # Basic Bus Support
 
 # PCI bus support
diff --git a/sys/arch/i386/conf/XBOX b/sys/arch/i386/conf/XBOX
index 8aa618269ca3..94eb458f61f4 100644
--- a/sys/arch/i386/conf/XBOX
+++ b/sys/arch/i386/conf/XBOX
@@ -1,4 +1,4 @@
-# $NetBSD: XBOX,v 1.13 2008/01/21 22:12:00 ichiro Exp $
+# $NetBSD: XBOX,v 1.14 2008/04/30 15:29:12 ad Exp $
 #
 # XBOX -- A basic Microsoft XBox kernel config file.
 #
@@ -85,10 +85,6 @@ config		netbsd	root on ? type nfs
 # Device configuration
 #
 
-mainbus0 at root
-
-cpu* at mainbus?
-
 # Basic Bus Support
 
 # PCI bus support
diff --git a/sys/arch/i386/conf/std.i386 b/sys/arch/i386/conf/std.i386
index c401cef02716..d4426caccdc1 100644
--- a/sys/arch/i386/conf/std.i386
+++ b/sys/arch/i386/conf/std.i386
@@ -1,4 +1,4 @@
-# $NetBSD: std.i386,v 1.27 2008/01/25 21:12:12 joerg Exp $
+# $NetBSD: std.i386,v 1.28 2008/04/30 15:29:12 ad Exp $
 #
 # standard, required NetBSD/i386 'options'
 
@@ -8,9 +8,14 @@ include		"conf/std"	# MI standard options
 options 	EXEC_AOUT	# exec a.out binaries
 options 	EXEC_ELF32	# exec ELF binaries
 options 	EXEC_SCRIPT	# exec #! scripts
-
 options 	CPU_IN_CKSUM
 #options 	CRYPTO_MD_DES_ENC	# machine-dependant code for DES
 #options 	CRYPTO_MD_DES_CBC	# machine-dependant DES CBC code
 #options 	CRYPTO_MD_BF_ENC	# machine-dependant code for BF_encrypt
 #options 	CRYPTO_MD_BF_CBC	# careful: uses bswapl, requires 486
+options		MULTIPROCESSOR		# multiprocessor supprot
+options 	MPBIOS			# configure CPUs and APICs using MPBIOS
+
+mainbus0 at root
+cpu* at mainbus?
+ioapic* at mainbus?