Put on my asbestos suit and move $mach/conf/*.$mach to conf/*.$mach as

hinted at in the previous config(8) commits.  I've spoken about this with
a few people and after the initial suprise wore off they thought it wasn't
a bad idea.  The upshot of it is that all the files*, Makefile*, options*
files are all right next to each other in the hope that people making
changes to one set will remember the others.

Note, config(8) looks to sys/conf first, and falls back to sys/$mach/conf
still, so this doesn't stop people working in subdirs for new platforms.
But once it's in the tree it can be moved next to the other files so that
the non-i386 platforms are (hopefully) treated a little better than as if
they were "second class" ports.

This does not change any user editable files.  the config program is
still run in the same directory as before, the per-platform files
(GENERIC, LINT etc) are still in the same place.

14 files changed, 6 insertions, 2554 deletions

diff --git a/sys/alpha/conf/Makefile.alpha b/sys/alpha/conf/Makefile.alpha
deleted file mode 100644
index 58402ee..0000000
--- a/sys/alpha/conf/Makefile.alpha
+++ /dev/null
@@ -1,295 +0,0 @@
-# Makefile.alpha -- with config changes.
-# Copyright 1990 W. Jolitz
-#	from: @(#)Makefile.alpha	7.1 5/10/91
-# $FreeBSD$
-#
-# Makefile for FreeBSD
-#
-# This makefile is constructed from a machine description:
-#	config machineid
-# Most changes should be made in the machine description
-#	/sys/alpha/conf/``machineid''
-# after which you should do
-#	 config machineid
-# Generic makefile changes should be made in
-#	/sys/alpha/conf/Makefile.alpha
-# after which config should be rerun for all machines.
-#
-
-# Which version of config(8) is required.
-%VERSREQ=	400017
-
-# Can be overridden by makeoptions or /etc/make.conf
-KERNEL?=	kernel
-STD8X16FONT?=	iso
-
-.if !defined(S)
-.if exists(./@/.)
-S=	./@
-.else
-S=	../..
-.endif
-.endif
-M=	${MACHINE_ARCH}
-
-SIZE?=	size
-
-COPTFLAGS?=-O
-INCLUDES= -nostdinc -I- -I. -I$S
-# This hack is to allow kernel compiles to succeed on machines w/out srcdist
-.if exists($S/../include)
-INCLUDES+= -I$S/../include
-.else
-INCLUDES+= -I/usr/include
-.endif
-COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
-CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
-
-# XXX LOCORE means "don't declare C stuff" not "for locore.s".
-ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
-
-# Select the correct set of tools. Can't set OBJFORMAT here because it
-# doesn't get exported into the environment, and if it were exported
-# then it might break building of utilities.
-FMT=		-elf
-CFLAGS+=	${FMT}
-
-LOAD_ADDRESS?=	0xfffffc0000300000
-DEFINED_PROF=	${PROF}
-.if defined(PROF)
-CFLAGS+=	-malign-functions=4
-.if ${PROFLEVEL} >= 2
-IDENT+=	-DGPROF4 -DGUPROF
-PROF+=	-mprofiler-epilogue
-.endif
-.endif
-
-# Put configuration-specific C flags last (except for ${PROF}) so that they
-# can override the others.
-CFLAGS+=	${CONF_CFLAGS}
-
-NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
-NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
-NORMAL_S= ${CC} -c ${ASM_CFLAGS} ${.IMPSRC}
-PROFILE_C= ${CC} -c ${CFLAGS} ${.IMPSRC}
-
-GEN_CFILES= $S/$M/$M/genassym.c
-# setdef0.c and setdef1.c are intentionally
-# omitted from SYSTEM_CFILES.  They include setdefs.h, a header which
-# is generated from all of ${OBJS}.  We don't want to have to compile
-# everything just to do a make depend.
-SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c
-SYSTEM_SFILES= $S/$M/$M/locore.s
-SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
-SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
-	setdef1.o hack.So
-SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/$M/conf/kernel.script \
-	-e locorestart \
-	-export-dynamic -dynamic-linker /red/herring \
-	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
-SYSTEM_LD_TAIL= @${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET}
-SYSTEM_DEP+= $S/$M/conf/kernel.script
-
-%BEFORE_DEPEND
-
-%OBJS
-
-%CFILES
-
-%SFILES
-
-%MFILES
-
-%CLEAN
-
-all: ${KERNEL}
-
-.if !defined(DEBUG)
-FULLKERNEL=	${KERNEL}
-.else
-FULLKERNEL=	${KERNEL}.debug
-${KERNEL}: ${FULLKERNEL}
-	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
-.endif
-
-${FULLKERNEL}: ${SYSTEM_DEP} vers.o
-	@rm -f ${.TARGET}
-	@echo linking ${.TARGET}
-	${SYSTEM_LD}
-	${SYSTEM_LD_TAIL}
-
-.if !exists(.depend)
-${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h}
-.endif
-
-clean:
-	rm -f *.o *.so *.So *.ko *.s eddep errs genassym \
-	      ${FULLKERNEL} ${KERNEL} linterrs makelinks param.c \
-	      setdef[01].c setdefs.h tags \
-	      vers.c vnode_if.c vnode_if.h ${CLEAN}
-
-#lint: /tmp param.c
-#	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \
-#	  $S/$M/$M/Locore.c ${CFILES} ioconf.c param.c | \
-#	    grep -v 'struct/union .* never defined' | \
-#	    grep -v 'possible pointer alignment problem'
-
-locore.o: $S/$M/$M/locore.s assym.s
-	${NORMAL_S}
-
-# This is a hack.  BFD "optimizes" away dynamic mode if there are no
-# dynamic references.  We could probably do a '-Bforcedynamic' mode like
-# in the a.out ld.  For now, this works.
-hack.So: Makefile
-	touch hack.c
-	${CC} ${FMT} -shared -nostdlib hack.c -o hack.So
-	rm -f hack.c
-
-.ORDER: setdefs.h setdef0.c setdef1.c
-
-setdef0.o: setdef0.c setdefs.h
-	${NORMAL_C}
-
-setdef1.o: setdef1.c setdefs.h
-	${NORMAL_C}
-
-setdef0.c setdef1.c setdefs.h: ${OBJS}
-	@gensetdefs ${OBJS}
-
-# this rule stops ./assym.s in .depend from causing problems
-./assym.s: assym.s
-
-assym.s: genassym.o
-	genassym genassym.o >assym.s
-
-genassym.o: $S/$M/$M/genassym.c
-	${CC} -c ${CFLAGS} $S/$M/$M/genassym.c
-
-SYSTEM_OBJS+=	__divqu.o __divq.o __divlu.o __divl.o
-SYSTEM_OBJS+=	__remqu.o __remq.o __remlu.o __reml.o
-CLEAN+=	__divqu.S __divq.S __divlu.S __divl.S
-CLEAN+=	__remqu.S __remq.S __remlu.S __reml.S
-
-__divqu.S: $S/$M/$M/divrem.m4
-	@echo 'building ${.TARGET} from ${.ALLSRC}'
-	@(echo "define(NAME,\`__divqu')define(OP,\`div')define(S,\`false')"; \
-	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
-
-__divq.S: $S/$M/$M/divrem.m4
-	@echo 'building ${.TARGET} from ${.ALLSRC}'
-	@(echo "define(NAME,\`__divq')define(OP,\`div')define(S,\`true')"; \
-	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
-
-__divlu.S: $S/$M/$M/divrem.m4
-	@echo 'building ${.TARGET} from ${.ALLSRC}'
-	@(echo "define(NAME,\`__divlu')define(OP,\`div')define(S,\`false')"; \
-	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
-
-__divl.S: $S/$M/$M/divrem.m4
-	@echo 'building ${.TARGET} from ${.ALLSRC}'
-	@(echo "define(NAME,\`__divl')define(OP,\`div')define(S,\`true')"; \
-	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
-
-__remqu.S: $S/$M/$M/divrem.m4
-	@echo 'building ${.TARGET} from ${.ALLSRC}'
-	@(echo "define(NAME,\`__remqu')define(OP,\`rem')define(S,\`false')"; \
-	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
-
-__remq.S: $S/$M/$M/divrem.m4
-	@echo 'building ${.TARGET} from ${.ALLSRC}'
-	@(echo "define(NAME,\`__remq')define(OP,\`rem')define(S,\`true')"; \
-	 echo "define(WORDSIZE,64)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
-
-__remlu.S: $S/$M/$M/divrem.m4
-	@echo 'building ${.TARGET} from ${.ALLSRC}'
-	@(echo "define(NAME,\`__remlu')define(OP,\`rem')define(S,\`false')"; \
-	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
-
-__reml.S: $S/$M/$M/divrem.m4
-	@echo 'building ${.TARGET} from ${.ALLSRC}'
-	@(echo "define(NAME,\`__reml')define(OP,\`rem')define(S,\`true')"; \
-	 echo "define(WORDSIZE,32)"; cat ${.ALLSRC}) | m4 > ${.TARGET}
-
-${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
-
-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
-	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} ${SYSTEM_SFILES}
-	rm -f .newdep
-	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES}
-	env MKDEP_CPP="${CC} -E" \
-	    mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES}
-	rm -f .depend
-	mv -f .newdep .depend
-
-cleandepend:
-	rm -f .depend
-
-links:
-	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
-	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
-	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
-	  sort -u | comm -23 - dontlink | \
-	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
-	sh makelinks && rm -f dontlink
-
-tags:
-	@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
-	sh $S/conf/systags.sh
-	rm -f tags1
-	sed -e 's,      ../,    ,' tags > tags1
-
-install install.debug:
-	@if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \
-		echo "You must build a kernel first." ; \
-		exit 1 ; \
-	fi
-.if exists(${DESTDIR}/${KERNEL})
-	-chflags noschg ${DESTDIR}/${KERNEL}
-	mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
-.endif
-	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL}
-
-reinstall reinstall.debug:
-	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${KERNEL}
-
-config.o:
-	${NORMAL_C}
-
-ioconf.o:
-	${NORMAL_C}
-
-param.c: $S/conf/param.c
-	-rm -f param.c
-	cp $S/conf/param.c .
-
-param.o:
-	${NORMAL_C}
-
-vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
-	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
-
-# XXX strictly, everything depends on Makefile because changes to ${PROF}
-# only appear there, but we don't handle that.
-vers.o:
-	${NORMAL_C}
-
-vnode_if.c: $S/kern/vnode_if.pl $S/kern/vnode_if.src
-	perl5 $S/kern/vnode_if.pl -c $S/kern/vnode_if.src
-
-vnode_if.h: $S/kern/vnode_if.pl $S/kern/vnode_if.src
-	perl5 $S/kern/vnode_if.pl -h $S/kern/vnode_if.src
-
-vnode_if.o:
-	${NORMAL_C}
-
-.if exists($S/../share/mk)
-.include "$S/../share/mk/bsd.kern.mk"
-.else
-.include <bsd.kern.mk>
-.endif
-
-%RULES
-
-# DO NOT DELETE THIS LINE -- make depend uses it
diff --git a/sys/alpha/conf/files.alpha b/sys/alpha/conf/files.alpha
deleted file mode 100644
index b7434e4..0000000
--- a/sys/alpha/conf/files.alpha
+++ /dev/null
@@ -1,201 +0,0 @@
-# This file tells config what files go into building a kernel,
-# files marked standard are always included.
-#
-# $FreeBSD$
-#
-# The long compile-with and dependency lines are required because of
-# limitations in config: backslash-newline doesn't work in strings, and
-# dependency lines other than the first are silently ignored.
-#
-#
-font8x16.o			optional	std8x16font		\
-	compile-with	"uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \
-	no-implicit-rule before-depend \
-	clean		"${STD8X16FONT}-8x16 font8x16.c"
-# make sure apm.h gets made correctly
-apm.h				standard				\
-	compile-with		"echo '#define NAPM 0' > apm.h"		\
-	no-obj no-implicit-rule before-depend
-
-#
-atkbdmap.h			optional	atkbd_dflt_keymap	\
-	compile-with	"kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"				\
-	no-obj no-implicit-rule before-depend				\
-	clean		"atkbdmap.h"
-#
-alpha/alpha/autoconf.c		standard
-alpha/alpha/cpuconf.c		standard
-alpha/alpha/atomic.s		standard
-alpha/alpha/dec_kn8ae.c		optional	dec_kn8ae
-alpha/alpha/dec_eb164.c		optional	dec_eb164
-alpha/alpha/dec_eb64plus.c	optional	dec_eb64plus
-alpha/alpha/dec_kn20aa.c	optional	dec_kn20aa
-alpha/alpha/dec_1000a.c		optional	dec_1000a
-alpha/alpha/dec_1000a.c		optional	dec_1000a
-alpha/alpha/dec_2100_a50.c	optional	dec_2100_a50
-alpha/alpha/dec_st550.c		optional	dec_st550
-alpha/alpha/dec_st6600.c	optional	dec_st6600
-alpha/alpha/dec_axppci_33.c	optional	dec_axppci_33
-alpha/alpha/dec_3000_300.c	optional	dec_3000_300
-alpha/alpha/dec_3000_500.c	optional	dec_3000_500
-alpha/alpha/mountroot.c		optional	slice
-alpha/alpha/ipl_funcs.c		standard
-alpha/alpha/pal.s		standard
-alpha/alpha/busdma_machdep.c	standard
-alpha/alpha/sgmap.c		standard
-alpha/alpha/prom.c		standard
-alpha/alpha/promcons.c		standard
-alpha/alpha/prom_disp.s		standard
-alpha/alpha/alpha-gdbstub.c	optional	ddb
-alpha/alpha/db_disasm.c		optional	ddb
-alpha/alpha/db_interface.c	optional	ddb
-alpha/alpha/db_trace.c		optional	ddb
-alpha/alpha/exception.s		standard
-alpha/alpha/in_cksum.c		optional	inet
-# locore.s needs to be handled in Makefile to put it first.  Otherwise it's
-# now normal.
-# alpha/alpha/locore.s		standard
-alpha/alpha/machdep.c		standard
-alpha/alpha/fp_emulate.c	standard
-alpha/alpha/ieee_float.c	standard
-alpha/alpha/mem.c		standard
-alpha/alpha/mp_machdep.c	optional	smp
-alpha/alpha/perfmon.c		optional	perfmon	profiling-routine
-alpha/alpha/perfmon.c		optional	perfmon
-alpha/alpha/pmap.c		standard
-alpha/alpha/procfs_machdep.c	standard
-alpha/alpha/simplelock.s	optional	smp
-alpha/alpha/support.s		standard
-alpha/alpha/swtch.s		standard
-alpha/alpha/sys_machdep.c	standard
-alpha/alpha/trap.c		standard
-alpha/alpha/interrupt.c		standard
-alpha/alpha/userconfig.c	optional	userconfig
-alpha/alpha/vm_machdep.c	standard
-alpha/alpha/clock.c		standard
-clock_if.o			standard				\
-	dependency	"clock_if.c"					\
-	compile-with	"${NORMAL_C}"					\
-	no-implicit-rule local
-clock_if.c			standard				\
-	dependency	"$S/kern/makedevops.pl $S/alpha/alpha/clock_if.m"	\
-	compile-with	"perl5 $S/kern/makedevops.pl -c $S/alpha/alpha/clock_if.m" \
-	no-obj no-implicit-rule before-depend local			\
-	clean		"clock_if.c"
-clock_if.h			standard				\
-	dependency	"$S/kern/makedevops.pl $S/alpha/alpha/clock_if.m"	\
-	compile-with	"perl5 $S/kern/makedevops.pl -h $S/alpha/alpha/clock_if.m" \
-	no-obj no-implicit-rule before-depend				\
-	clean		"clock_if.h"
-alpha/tlsb/tlsb.c		optional	tlsb
-alpha/tlsb/gbus.c		optional	gbus
-alpha/tlsb/kftxx.c		optional	kft
-alpha/tlsb/mcclock_tlsb.c	optional	gbus
-alpha/tlsb/zs_tlsb.c		optional	gbus
-alpha/tlsb/dwlpx.c		optional	dwlpx
-alpha/tc/tcasic.c		optional	dec_3000_300
-alpha/tc/tcasic.c		optional	dec_3000_500
-alpha/tc/tc.c			optional	dec_3000_300
-alpha/tc/tc.c			optional	dec_3000_500
-alpha/tc/ioasic.c		optional	dec_3000_300
-alpha/tc/ioasic.c		optional	dec_3000_500
-alpha/tc/mcclock_ioasic.c	optional	dec_3000_300
-alpha/tc/mcclock_ioasic.c	optional	dec_3000_500
-alpha/tc/if_le_ioasic.c		optional	le dec_3000_300
-alpha/tc/if_le_ioasic.c		optional	le dec_3000_500
-alpha/tc/if_le_dec.c		optional	le dec_3000_300
-alpha/tc/if_le_dec.c		optional	le dec_3000_500
-alpha/tc/am7990.c		optional	le dec_3000_300
-alpha/tc/am7990.c		optional	le dec_3000_500
-alpha/tc/tcds.c			optional	esp dec_3000_300
-alpha/tc/tcds.c			optional	esp dec_3000_500
-alpha/tc/tcds_dma.c		optional	tcds dec_3000_300
-alpha/tc/tcds_dma.c		optional	tcds dec_3000_500
-alpha/tc/esp.c			optional	esp dec_3000_300
-alpha/tc/esp.c			optional	esp dec_3000_500
-dev/dec/mcclock.c		optional	mcclock
-mcclock_if.o			optional	mcclock			\
-	dependency	"mcclock_if.c"					\
-	compile-with	"${NORMAL_C}"					\
-	no-implicit-rule local
-mcclock_if.c			standard				\
-	dependency	"$S/kern/makedevops.pl $S/dev/dec/mcclock_if.m"	\
-	compile-with	"perl5 $S/kern/makedevops.pl -c $S/dev/dec/mcclock_if.m" \
-	no-obj no-implicit-rule before-depend local			\
-	clean		"mcclock_if.c"
-mcclock_if.h			optional	mcclock			\
-	dependency	"$S/kern/makedevops.pl $S/dev/dec/mcclock_if.m"	\
-	compile-with	"perl5 $S/kern/makedevops.pl -h $S/dev/dec/mcclock_if.m" \
-	no-obj no-implicit-rule before-depend				\
-	clean		"mcclock_if.h"
-alpha/alpha/elf_machdep.c	standard
-alpha/isa/isa.c			optional	isa
-alpha/isa/isa_dma.c		optional	isa
-alpha/isa/mcclock_isa.c		optional	isa
-alpha/pci/apecs.c		optional	dec_2100_a50
-alpha/pci/apecs.c		optional	dec_eb64plus
-alpha/pci/apecs.c		optional	dec_1000a
-alpha/pci/apecs_pci.c		optional	dec_2100_a50
-alpha/pci/apecs_pci.c		optional	dec_eb64plus
-alpha/pci/apecs_pci.c		optional	dec_1000a
-alpha/pci/cia.c			optional	dec_eb164
-alpha/pci/cia.c			optional	dec_kn20aa
-alpha/pci/cia.c			optional	dec_st550
-alpha/pci/cia.c			optional	dec_1000a
-alpha/pci/cia_pci.c		optional	dec_eb164
-alpha/pci/cia_pci.c		optional	dec_kn20aa
-alpha/pci/cia_pci.c		optional	dec_st550
-alpha/pci/cia_pci.c		optional	dec_1000a
-alpha/pci/lca.c			optional	dec_axppci_33
-alpha/pci/lca_pci.c		optional	dec_axppci_33
-alpha/pci/pci_eb164_intr.s	optional	dec_eb164
-alpha/pci/pci_eb164_intr.s	optional	dec_kn20aa
-alpha/pci/pci_eb164_intr.s	optional	dec_st550
-alpha/pci/pci_eb64plus_intr.s	optional	dec_2100_a50
-alpha/pci/pci_eb64plus_intr.s	optional	dec_eb64plus
-alpha/pci/pcibus.c		optional	pci
-alpha/pci/tsunami.c		optional	dec_st6600
-alpha/pci/tsunami_pci.c		optional	dec_st6600
-dev/ata/ata-all.c		optional	ata
-dev/ata/ata-disk.c		optional	atadisk
-dev/ata/ata-dma.c		optional	ata
-dev/ata/atapi-all.c		optional	ata
-dev/ata/atapi-cd.c		optional	atapicd
-dev/ata/atapi-fd.c		optional	atapifd
-dev/ata/atapi-tape.c		optional	atapist
-dev/fb/fb.c			optional	fb
-dev/fb/fb.c			optional	vga
-dev/fb/splash.c			optional	splash
-dev/fb/vga.c			optional	vga
-dev/kbd/atkbd.c			optional	atkbd
-dev/kbd/atkbdc.c		optional	atkbdc
-dev/kbd/kbd.c			optional	atkbd
-dev/kbd/kbd.c			optional	kbd
-dev/kbd/kbd.c			optional	sc
-dev/kbd/kbd.c			optional	ukbd
-dev/sound/isa/ad1816.c		optional	pcm isa
-dev/sound/isa/es1888.c		optional	pcm isa
-dev/sound/isa/gusc.c		optional	gusc isa
-dev/sound/isa/mss.c		optional	pcm isa
-dev/sound/isa/sb.c		optional	pcm isa
-dev/sound/isa/sbc.c		optional	sbc
-dev/syscons/schistory.c		optional	sc
-dev/syscons/scmouse.c		optional	sc
-dev/syscons/scvgarndr.c		optional	sc
-dev/syscons/scvidctl.c		optional	sc
-dev/syscons/scvtb.c		optional	sc
-dev/syscons/syscons.c		optional	sc
-isa/atkbd_isa.c			optional	atkbd
-isa/atkbdc_isa.c		optional	atkbdc
-isa/fd.c			optional	fd
-isa/psm.c			optional	psm
-isa/sio.c			optional	sio
-isa/syscons_isa.c		optional	sc
-isa/vga_isa.c			optional	vga
-kern/subr_diskmbr.c		standard
-libkern/alpha/htonl.S		standard
-libkern/alpha/htons.S		standard
-libkern/alpha/ntohl.S		standard
-libkern/alpha/ntohs.S		standard
-libkern/bcmp.c			standard
-libkern/ffs.c			standard
diff --git a/sys/alpha/conf/kernel.script b/sys/alpha/conf/kernel.script
deleted file mode 100644
index 1bcfd90..0000000
--- a/sys/alpha/conf/kernel.script
+++ /dev/null
@@ -1,132 +0,0 @@
-OUTPUT_FORMAT("elf64-alpha", "elf64-alpha",
-	      "elf64-alpha")
-OUTPUT_ARCH(alpha)
-ENTRY(__start)
-SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/egcs/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/egcs/alphaev5-unknown-linux-gnu/lib);
-   kernel_text = 0xfffffc0000300000;
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = 0xfffffc0000300000 + SIZEOF_HEADERS;
-  .interp     : { *(.interp) 	}
-  .hash          : { *(.hash)		}
-  .dynsym        : { *(.dynsym)		}
-  .dynstr        : { *(.dynstr)		}
-  .gnu.version   : { *(.gnu.version)	}
-  .gnu.version_d   : { *(.gnu.version_d)	}
-  .gnu.version_r   : { *(.gnu.version_r)	}
-  .rel.text      :
-    { *(.rel.text) *(.rel.gnu.linkonce.t*) }
-  .rela.text     :
-    { *(.rela.text) *(.rela.gnu.linkonce.t*) }
-  .rel.data      :
-    { *(.rel.data) *(.rel.gnu.linkonce.d*) }
-  .rela.data     :
-    { *(.rela.data) *(.rela.gnu.linkonce.d*) }
-  .rel.rodata    :
-    { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
-  .rela.rodata   :
-    { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
-  .rel.got       : { *(.rel.got)		}
-  .rela.got      : { *(.rela.got)		}
-  .rel.ctors     : { *(.rel.ctors)	}
-  .rela.ctors    : { *(.rela.ctors)	}
-  .rel.dtors     : { *(.rel.dtors)	}
-  .rela.dtors    : { *(.rela.dtors)	}
-  .rel.init      : { *(.rel.init)	}
-  .rela.init     : { *(.rela.init)	}
-  .rel.fini      : { *(.rel.fini)	}
-  .rela.fini     : { *(.rela.fini)	}
-  .rel.bss       : { *(.rel.bss)		}
-  .rela.bss      : { *(.rela.bss)		}
-  .rel.plt       : { *(.rel.plt)		}
-  .rela.plt      : { *(.rela.plt)		}
-  .init          : { *(.init)	} =0x47ff041f
-  .text      :
-  {
-    *(.text)
-    *(.stub)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t*)
-  } =0x47ff041f
-  _etext = .;
-  PROVIDE (etext = .);
-  .fini      : { *(.fini)    } =0x47ff041f
-  .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
-  .rodata1   : { *(.rodata1) }
-  .reginfo : { *(.reginfo) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = .;
-  .data    :
-  {
-    *(.data)
-    *(.gnu.linkonce.d*)
-    CONSTRUCTORS
-  }
-  .data1   : { *(.data1) }
-  .ctors         :
-  {
-    *(.ctors)
-  }
-  .dtors         :
-  {
-    *(.dtors)
-  }
-  .plt      : { *(.plt)	}
-  .got           : { *(.got.plt) *(.got) }
-  .dynamic       : { *(.dynamic) }
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata     : { *(.sdata) }
-  _edata  =  .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  .sbss      : { *(.sbss) *(.scommon) }
-  .bss       :
-  {
-   *(.dynbss)
-   *(.bss)
-   *(COMMON)
-  }
-  . = ALIGN(64 / 8);
-  _end = . ;
-  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* These must appear regardless of  .  */
-}
-
diff --git a/sys/alpha/conf/options.alpha b/sys/alpha/conf/options.alpha
deleted file mode 100644
index 56b8f3e..0000000
--- a/sys/alpha/conf/options.alpha
+++ /dev/null
@@ -1,65 +0,0 @@
-# $FreeBSD$
-
-EV5			opt_global.h
-EV4			opt_global.h
-DEC_KN8AE		opt_cpu.h
-DEC_EB164		opt_cpu.h
-DEC_EB64PLUS		opt_cpu.h
-DEC_KN20AA		opt_cpu.h
-DEC_2100_A50		opt_cpu.h
-DEC_ST550		opt_cpu.h
-DEC_ST6600		opt_cpu.h
-DEC_AXPPCI_33		opt_cpu.h
-DEC_3000_300		opt_cpu.h
-DEC_3000_500		opt_cpu.h
-DEC_1000A		opt_cpu.h
-
-ATAPI			opt_atapi.h
-ATAPI_STATIC		opt_atapi.h
-
-CMD640			opt_wd.h
-
-SHOW_BUSYBUFS
-PANIC_REBOOT_WAIT_TIME	opt_panic.h
-
-MAXCONS			opt_syscons.h
-SC_ALT_MOUSE_IMAGE	opt_syscons.h
-SC_DEBUG_LEVEL		opt_syscons.h
-SC_DFLT_FONT		opt_syscons.h
-SC_DISABLE_DDB		opt_syscons.h
-SC_DISABLE_REBOOT	opt_syscons.h
-SC_HISTORY_SIZE		opt_syscons.h
-SC_KERNEL_CONS_ATTR	opt_syscons.h
-SC_KERNEL_CONS_REV_ATTR	opt_syscons.h
-SC_MOUSE_CHAR		opt_syscons.h
-SC_NO_CUTPASTE		opt_syscons.h
-SC_NO_FONT_LOADING	opt_syscons.h
-SC_NO_HISTORY		opt_syscons.h
-SC_NO_SYSMOUSE		opt_syscons.h
-SC_NORM_ATTR		opt_syscons.h
-SC_NORM_REV_ATTR	opt_syscons.h
-SC_PIXEL_MODE		opt_syscons.h
-SC_RENDER_DEBUG		opt_syscons.h
-SC_TWOBUTTON_MOUSE	opt_syscons.h
-
-VGA_ALT_SEQACCESS	opt_vga.h
-VGA_DEBUG		opt_vga.h
-VGA_NO_FONT_LOADING	opt_vga.h
-VGA_NO_MODE_CHANGE	opt_vga.h
-VGA_SLOW_IOACCESS	opt_vga.h
-VGA_WIDTH90		opt_vga.h
-
-PSM_HOOKRESUME		opt_psm.h
-PSM_RESETAFTERSUSPEND	opt_psm.h
-PSM_DEBUG		opt_psm.h
-
-# Atkbd options
-ATKBD_DFLT_KEYMAP	opt_atkbd.h
-
-# Kbd options
-KBD_DISABLE_KEYMAP_LOAD	opt_kbd.h
-KBD_INSTALL_CDEV	opt_kbd.h
-KBD_MAXRETRY		opt_kbd.h
-KBD_MAXWAIT		opt_kbd.h
-KBD_RESETDELAY		opt_kbd.h
-KBDIO_DEBUG		opt_kbd.h
diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 58402ee..1c0312a 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -83,12 +83,12 @@ SYSTEM_SFILES= $S/$M/$M/locore.s
 SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.So
-SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/$M/conf/kernel.script \
+SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
 	-e locorestart \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET}
-SYSTEM_DEP+= $S/$M/conf/kernel.script
+SYSTEM_DEP+= $S/conf/ldscript.$M
 
 %BEFORE_DEPEND
 
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index 4a21594..917f1ba 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -83,11 +83,11 @@ SYSTEM_SFILES= $S/$M/$M/locore.s
 SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.So
-SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/$M/conf/kernel.script \
+SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET}
-SYSTEM_DEP+= $S/$M/conf/kernel.script
+SYSTEM_DEP+= $S/conf/ldscript.$M
 
 %BEFORE_DEPEND
 
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index 4a21594..917f1ba 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -83,11 +83,11 @@ SYSTEM_SFILES= $S/$M/$M/locore.s
 SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
 SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
 	setdef1.o hack.So
-SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/$M/conf/kernel.script \
+SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
 SYSTEM_LD_TAIL= @${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET}
-SYSTEM_DEP+= $S/$M/conf/kernel.script
+SYSTEM_DEP+= $S/conf/ldscript.$M
 
 %BEFORE_DEPEND
 
diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386
deleted file mode 100644
index 4a21594..0000000
--- a/sys/i386/conf/Makefile.i386
+++ /dev/null
@@ -1,251 +0,0 @@
-# Makefile.i386 -- with config changes.
-# Copyright 1990 W. Jolitz
-#	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
-#
-# Makefile for FreeBSD
-#
-# This makefile is constructed from a machine description:
-#	config machineid
-# Most changes should be made in the machine description
-#	/sys/i386/conf/``machineid''
-# after which you should do
-#	 config machineid
-# Generic makefile changes should be made in
-#	/sys/i386/conf/Makefile.i386
-# after which config should be rerun for all machines.
-#
-
-# Which version of config(8) is required.
-%VERSREQ=	400017
-
-# Can be overridden by makeoptions or /etc/make.conf
-KERNEL?=	kernel
-STD8X16FONT?=	iso
-
-.if !defined(S)
-.if exists(./@/.)
-S=	./@
-.else
-S=	../..
-.endif
-.endif
-M=	${MACHINE_ARCH}
-
-SIZE?=	size
-
-COPTFLAGS?=-O
-INCLUDES= -nostdinc -I- -I. -I$S
-# This hack is to allow kernel compiles to succeed on machines w/out srcdist
-.if exists($S/../include)
-INCLUDES+= -I$S/../include
-.else
-INCLUDES+= -I/usr/include
-.endif
-COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
-CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
-
-# XXX LOCORE means "don't declare C stuff" not "for locore.s".
-ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
-
-# Select the correct set of tools. Can't set OBJFORMAT here because it
-# doesn't get exported into the environment, and if it were exported
-# then it might break building of utilities.
-FMT=		-elf
-CFLAGS+=	${FMT}
-
-LOAD_ADDRESS?=	C0100000
-DEFINED_PROF=	${PROF}
-.if defined(PROF)
-CFLAGS+=	-malign-functions=4
-.if ${PROFLEVEL} >= 2
-IDENT+=	-DGPROF4 -DGUPROF
-PROF+=	-mprofiler-epilogue
-.endif
-.endif
-
-# Put configuration-specific C flags last (except for ${PROF}) so that they
-# can override the others.
-CFLAGS+=	${CONF_CFLAGS}
-
-NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
-NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
-NORMAL_S= ${CC} -c ${ASM_CFLAGS} ${.IMPSRC}
-PROFILE_C= ${CC} -c ${CFLAGS} ${.IMPSRC}
-
-GEN_CFILES= $S/$M/$M/genassym.c
-# setdef0.c and setdef1.c are intentionally
-# omitted from SYSTEM_CFILES.  They include setdefs.h, a header which
-# is generated from all of ${OBJS}.  We don't want to have to compile
-# everything just to do a make depend.
-SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c
-SYSTEM_SFILES= $S/$M/$M/locore.s
-SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
-SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
-	setdef1.o hack.So
-SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/$M/conf/kernel.script \
-	-export-dynamic -dynamic-linker /red/herring \
-	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
-SYSTEM_LD_TAIL= @${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET}
-SYSTEM_DEP+= $S/$M/conf/kernel.script
-
-%BEFORE_DEPEND
-
-%OBJS
-
-%CFILES
-
-%SFILES
-
-%MFILES
-
-%CLEAN
-
-all: ${KERNEL}
-
-.if !defined(DEBUG)
-FULLKERNEL=	${KERNEL}
-.else
-FULLKERNEL=	${KERNEL}.debug
-${KERNEL}: ${FULLKERNEL}
-	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
-.endif
-
-${FULLKERNEL}: ${SYSTEM_DEP} vers.o
-	@rm -f ${.TARGET}
-	@echo linking ${.TARGET}
-	${SYSTEM_LD}
-	${SYSTEM_LD_TAIL}
-
-.if !exists(.depend)
-${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h}
-.endif
-
-clean:
-	rm -f *.o *.so *.So *.ko *.s eddep errs genassym \
-	      ${FULLKERNEL} ${KERNEL} linterrs makelinks param.c \
-	      setdef[01].c setdefs.h tags \
-	      vers.c vnode_if.c vnode_if.h ${CLEAN}
-
-#lint: /tmp param.c
-#	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \
-#	  $S/$M/$M/Locore.c ${CFILES} ioconf.c param.c | \
-#	    grep -v 'struct/union .* never defined' | \
-#	    grep -v 'possible pointer alignment problem'
-
-locore.o: $S/$M/$M/locore.s assym.s
-	${NORMAL_S}
-
-# This is a hack.  BFD "optimizes" away dynamic mode if there are no
-# dynamic references.  We could probably do a '-Bforcedynamic' mode like
-# in the a.out ld.  For now, this works.
-hack.So: Makefile
-	touch hack.c
-	${CC} ${FMT} -shared -nostdlib hack.c -o hack.So
-	rm -f hack.c
-
-.ORDER: setdefs.h setdef0.c setdef1.c
-
-setdef0.o: setdef0.c setdefs.h
-	${NORMAL_C}
-
-setdef1.o: setdef1.c setdefs.h
-	${NORMAL_C}
-
-setdef0.c setdef1.c setdefs.h: ${OBJS}
-	@gensetdefs ${OBJS}
-
-# this rule stops ./assym.s in .depend from causing problems
-./assym.s: assym.s
-
-assym.s: genassym.o
-	genassym genassym.o >assym.s
-
-genassym.o: $S/$M/$M/genassym.c
-	${CC} -c ${CFLAGS} $S/$M/$M/genassym.c
-
-${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
-
-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
-	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} ${SYSTEM_SFILES}
-	rm -f .newdep
-	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES}
-	env MKDEP_CPP="${CC} -E" \
-	    mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES}
-	rm -f .depend
-	mv -f .newdep .depend
-
-cleandepend:
-	rm -f .depend
-
-links:
-	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
-	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
-	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
-	  sort -u | comm -23 - dontlink | \
-	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
-	sh makelinks && rm -f dontlink
-
-tags:
-	@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
-	sh $S/conf/systags.sh
-	rm -f tags1
-	sed -e 's,      ../,    ,' tags > tags1
-
-install install.debug:
-	@if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \
-		echo "You must build a kernel first." ; \
-		exit 1 ; \
-	fi
-.if exists(${DESTDIR}/${KERNEL})
-	-chflags noschg ${DESTDIR}/${KERNEL}
-	mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
-.endif
-	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL}
-
-reinstall reinstall.debug:
-	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${KERNEL}
-
-config.o:
-	${NORMAL_C}
-
-ioconf.o:
-	${NORMAL_C}
-
-param.c: $S/conf/param.c
-	-rm -f param.c
-	cp $S/conf/param.c .
-
-param.o:
-	${NORMAL_C}
-
-vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
-	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
-
-# XXX strictly, everything depends on Makefile because changes to ${PROF}
-# only appear there, but we don't handle that.
-vers.o:
-	${NORMAL_C}
-
-vnode_if.c: $S/kern/vnode_if.pl $S/kern/vnode_if.src
-	perl5 $S/kern/vnode_if.pl -c $S/kern/vnode_if.src
-
-vnode_if.h: $S/kern/vnode_if.pl $S/kern/vnode_if.src
-	perl5 $S/kern/vnode_if.pl -h $S/kern/vnode_if.src
-
-vnode_if.o:
-	${NORMAL_C}
-
-# Commented out for now pending a better solution.
-# How do we pick up compiler version specific flags??
-#.if exists($S/../share/mk)
-#.include "$S/../share/mk/bsd.kern.mk"
-#.else
-.include <bsd.kern.mk>
-#.endif
-
-%RULES
-
-# DO NOT DELETE THIS LINE -- make depend uses it
diff --git a/sys/i386/conf/files.i386 b/sys/i386/conf/files.i386
deleted file mode 100644
index 148d0bc..0000000
--- a/sys/i386/conf/files.i386
+++ /dev/null
@@ -1,414 +0,0 @@
-# This file tells config what files go into building a kernel,
-# files marked standard are always included.
-#
-# $FreeBSD$
-#
-# The long compile-with and dependency lines are required because of
-# limitations in config: backslash-newline doesn't work in strings, and
-# dependency lines other than the first are silently ignored.
-#
-linux_genassym.o		optional	compat_linux		   \
-	dependency 	"$S/i386/linux/linux_genassym.c"		   \
-	compile-with	"${CC} ${CFLAGS} -c ${.IMPSRC}"			   \
-	no-obj no-implicit-rule						   \
-	clean		"linux_genassym.o"
-#
-svr4_genassym.o			optional	compat_svr4		   \
-	dependency 	"$S/i386/svr4/svr4_genassym.c"			   \
-	compile-with	"${CC} ${CFLAGS} -c ${.IMPSRC}"			   \
-	no-obj no-implicit-rule						   \
-	clean		"svr4_genassym.o"
-#
-linux_assym.h			optional	compat_linux		   \
-	dependency 	"linux_genassym.o"				   \
-	compile-with	"genassym linux_genassym.o > ${.TARGET}"	   \
-	no-obj no-implicit-rule before-depend				   \
-	clean		"linux_assym.h"
-#
-svr4_assym.h			optional	compat_svr4		   \
-	dependency 	"svr4_genassym.o"			   	   \
-	compile-with	"genassym svr4_genassym.o > ${.TARGET}"		   \
-	no-obj no-implicit-rule before-depend				   \
-	clean		"svr4_assym.h"
-#
-font.h				optional	sc_dflt_font		\
-	compile-with	"uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \
-	no-obj no-implicit-rule before-depend				\
-	clean		"font.h"
-#
-atkbdmap.h			optional	atkbd_dflt_keymap	\
-	compile-with	"kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"				\
-	no-obj no-implicit-rule before-depend				\
-	clean		"atkbdmap.h"
-#
-ukbdmap.h			optional	ukbd_dflt_keymap	\
-	compile-with	"kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"				\
-	no-obj no-implicit-rule before-depend				\
-	clean		"ukbdmap.h"
-#
-contrib/dev/fla/fla.c		optional	fla
-msysosak.o			optional	fla			\
-	dependency	"$S/contrib/dev/fla/i386/msysosak.o.uu" 		\
-	compile-with	"uudecode < $S/contrib/dev/fla/i386/msysosak.o.uu"	\
-	no-implicit-rule
-#
-contrib/dev/oltr/if_oltr.c	optional	oltr
-trlld.o				optional	oltr			\
-	dependency	"$S/contrib/dev/oltr/i386${FMT}.trlld.o.uu"	\
-	compile-with	"uudecode < $S/contrib/dev/oltr/i386${FMT}.trlld.o.uu"	\
-	no-implicit-rule
-contrib/dev/oltr/trlldbm.c	optional	oltr
-contrib/dev/oltr/trlldhm.c	optional	oltr
-contrib/dev/oltr/trlldmac.c	optional	oltr
-dev/ata/ata-all.c		optional	ata 
-dev/ata/ata-dma.c		optional	ata 
-dev/ata/ata-disk.c		optional	atadisk
-dev/ata/atapi-all.c		optional	atapicd 
-dev/ata/atapi-all.c		optional	atapifd 
-dev/ata/atapi-all.c		optional	atapist
-dev/ata/atapi-cd.c		optional	atapicd
-dev/ata/atapi-fd.c		optional	atapifd
-dev/ata/atapi-tape.c		optional	atapist
-dev/ed/if_ed.c			optional	ed
-dev/ed/if_ed_isa.c		optional	ed isa
-dev/ed/if_ed_pccard.c		optional	ed card
-dev/fb/fb.c			optional	fb
-dev/fb/fb.c			optional	vga
-dev/fb/splash.c			optional	splash
-dev/fb/vga.c			optional	vga
-dev/kbd/atkbd.c			optional	atkbd
-dev/kbd/atkbdc.c		optional	atkbdc
-dev/kbd/kbd.c			optional	atkbd
-dev/kbd/kbd.c			optional	kbd
-dev/kbd/kbd.c			optional	sc
-dev/kbd/kbd.c			optional	ukbd
-dev/kbd/kbd.c			optional	vt
-dev/pccard/if_xe.c		optional	xe
-dev/sound/isa/ad1816.c		optional	pcm isa
-dev/sound/isa/es1888.c		optional	pcm isa
-dev/sound/isa/gusc.c		optional	gusc isa
-dev/sound/isa/mss.c		optional	pcm isa
-dev/sound/isa/sb.c		optional	pcm isa
-dev/sound/isa/sbc.c		optional	sbc
-dev/syscons/schistory.c		optional	sc
-dev/syscons/scmouse.c		optional	sc
-dev/syscons/scvesactl.c		optional	sc
-dev/syscons/scvgarndr.c		optional	sc
-dev/syscons/scvidctl.c		optional	sc
-dev/syscons/scvtb.c		optional	sc
-dev/syscons/syscons.c		optional	sc
-gnu/i386/fpemul/div_small.s	optional	gpl_math_emulate
-gnu/i386/fpemul/errors.c	optional	gpl_math_emulate
-gnu/i386/fpemul/fpu_arith.c	optional	gpl_math_emulate
-gnu/i386/fpemul/fpu_aux.c	optional	gpl_math_emulate
-gnu/i386/fpemul/fpu_entry.c	optional	gpl_math_emulate
-gnu/i386/fpemul/fpu_etc.c	optional	gpl_math_emulate
-gnu/i386/fpemul/fpu_trig.c	optional	gpl_math_emulate
-gnu/i386/fpemul/get_address.c	optional	gpl_math_emulate
-gnu/i386/fpemul/load_store.c	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_2xm1.c	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_atan.c	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_div.s	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_l2.c	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_mul64.s	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_sin.c	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_tan.c	optional	gpl_math_emulate
-gnu/i386/fpemul/polynomial.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_add_sub.c	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_compare.c	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_constant.c	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_div.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_ld_str.c	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_mul.c	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_norm.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_round.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_u_add.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_u_div.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_u_mul.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_u_sub.s	optional	gpl_math_emulate
-gnu/i386/fpemul/wm_shrx.s	optional	gpl_math_emulate
-gnu/i386/fpemul/wm_sqrt.s	optional	gpl_math_emulate
-gnu/i386/isa/dgb.c		optional	dgb
-gnu/i386/isa/dgm.c		optional	dgm
-gnu/i386/isa/sound/awe_wave.c	optional	awe
-i386/apm/apm.c			optional	apm
-i386/eisa/adv_eisa.c		optional	adv
-i386/eisa/ahb.c			optional	ahb
-i386/eisa/ahc_eisa.c		optional	eisa ahc    \
-	dependency	"aic7xxx_reg.h $S/i386/eisa/ahc_eisa.c"
-i386/eisa/eisaconf.c		optional	eisa
-i386/eisa/if_fea.c		optional	fea
-i386/eisa/if_vx_eisa.c		optional	vx
-i386/i386/atomic.c		standard				\
-	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
-i386/i386/autoconf.c		standard
-i386/i386/bios.c		standard
-i386/i386/bioscall.s		standard
-i386/i386/busdma_machdep.c	standard
-i386/i386/db_disasm.c		optional	ddb
-i386/i386/db_interface.c	optional	ddb
-i386/i386/db_trace.c		optional	ddb
-i386/i386/elf_machdep.c		standard
-i386/i386/exception.s		standard
-i386/i386/globals.s		standard
-i386/i386/i386-gdbstub.c	optional	ddb
-i386/i386/i686_mem.c		standard
-i386/i386/identcpu.c		standard
-i386/i386/in_cksum.c		optional	inet
-i386/i386/initcpu.c		standard
-#i386/i386/k6_mem.c		standard
-# locore.s needs to be handled in Makefile to put it first.  Otherwise it's
-# now normal.
-# i386/i386/locore.s		standard
-i386/i386/machdep.c		standard
-i386/i386/math_emulate.c	optional	math_emulate
-i386/i386/mem.c			standard
-i386/i386/mp_clock.c		optional	smp
-i386/i386/mp_machdep.c		optional	smp
-i386/i386/mpapic.c		optional	smp
-i386/i386/mpboot.s		optional	smp
-i386/i386/mplock.s		optional	smp
-i386/i386/nexus.c		standard
-i386/i386/perfmon.c		optional	perfmon
-i386/i386/perfmon.c		optional	perfmon	profiling-routine
-i386/i386/pmap.c		standard
-i386/i386/procfs_machdep.c	standard
-i386/i386/simplelock.s		optional	smp
-i386/i386/support.s		standard
-i386/i386/swtch.s		standard
-i386/i386/sys_machdep.c		standard
-i386/i386/trap.c		standard
-i386/i386/userconfig.c		optional	userconfig
-i386/i386/vm86.c		standard
-i386/i386/vm_machdep.c		standard
-i386/ibcs2/ibcs2_errno.c	optional	ibcs2
-i386/ibcs2/ibcs2_fcntl.c	optional	ibcs2
-i386/ibcs2/ibcs2_ioctl.c	optional	ibcs2
-i386/ibcs2/ibcs2_ipc.c		optional	ibcs2
-i386/ibcs2/ibcs2_isc.c		optional	ibcs2
-i386/ibcs2/ibcs2_isc_sysent.c	optional	ibcs2
-i386/ibcs2/ibcs2_misc.c		optional	ibcs2
-i386/ibcs2/ibcs2_msg.c		optional	ibcs2
-i386/ibcs2/ibcs2_other.c	optional	ibcs2
-i386/ibcs2/ibcs2_signal.c	optional	ibcs2
-i386/ibcs2/ibcs2_socksys.c	optional	ibcs2
-i386/ibcs2/ibcs2_stat.c		optional	ibcs2
-i386/ibcs2/ibcs2_sysent.c	optional	ibcs2
-i386/ibcs2/ibcs2_sysi86.c	optional	ibcs2
-i386/ibcs2/ibcs2_sysvec.c	optional	ibcs2
-i386/ibcs2/ibcs2_util.c		optional	ibcs2
-i386/ibcs2/ibcs2_xenix.c	optional	ibcs2
-i386/ibcs2/ibcs2_xenix_sysent.c	optional	ibcs2
-i386/ibcs2/imgact_coff.c	optional	ibcs2
-i386/isa/adv_isa.c		optional	adv
-i386/isa/asc.c			optional	asc
-i386/isa/atapi-cd.c		optional	wcd	\
-	warning "The wcd driver is obsolete.  Please use the atapicd driver!"
-i386/isa/atapi.c		optional	wdc	\
-	warning "The wdc driver is obsolete.  Please use the ata driver!"
-i386/isa/clock.c		standard
-i386/isa/cronyx.c		optional	cx
-i386/isa/ctx.c			optional	ctx
-i386/isa/cx.c			optional	cx
-i386/isa/cy.c			optional	cy
-i386/isa/elink.c		optional	ep
-i386/isa/elink.c		optional	ie
-isa/fd.c			optional	fd
-i386/isa/gpib.c			optional	gp
-i386/isa/gsc.c			optional	gsc
-i386/isa/if_ar.c		optional	ar
-i386/isa/if_cs.c		optional	cs
-i386/isa/if_cx.c		optional	cx
-i386/isa/if_el.c		optional	el
-i386/isa/if_ex.c		optional	ex
-i386/isa/if_fe.c		optional	fe
-i386/isa/if_ie.c		optional	ie
-i386/isa/if_le.c		optional	le
-i386/isa/if_lnc.c		optional	lnc
-i386/isa/if_rdp.c		optional	rdp
-i386/isa/if_sr.c		optional	sr
-i386/isa/if_wi.c		optional	wi card
-i386/isa/if_wl.c		optional	wl
-i386/isa/if_wlp.c		optional	wlp
-i386/isa/intr_machdep.c		standard
-i386/isa/ipl_funcs.c		standard				   \
-	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
-i386/isa/isa.c			optional	isa
-i386/isa/isa_compat.c		optional	isa
-i386/isa/isa_dma.c		optional	isa
-i386/isa/istallion.c		optional	stli
-i386/isa/labpc.c		optional	labpc
-i386/isa/loran.c		optional	loran
-i386/isa/matcd/matcd.c		optional	matcd
-i386/isa/mca_machdep.c		optional	mca
-i386/isa/mcd.c			optional	mcd
-i386/isa/mse.c			optional	mse
-i386/isa/npx.c			mandatory	npx
-i386/isa/pcaudio.c		optional	pca
-i386/isa/pcf.c			optional	pcf
-i386/isa/pcibus.c		optional	pci
-i386/isa/pcvt/pcvt_drv.c	optional	vt
-i386/isa/pcvt/pcvt_ext.c	optional	vt
-i386/isa/pcvt/pcvt_kbd.c	optional	vt
-i386/isa/pcvt/pcvt_out.c	optional	vt
-i386/isa/pcvt/pcvt_sup.c	optional	vt
-i386/isa/pcvt/pcvt_vtf.c	optional	vt
-i386/isa/ppc.c			optional	ppc
-i386/isa/prof_machdep.c		optional	profiling-routine
-i386/isa/random_machdep.c	standard
-i386/isa/rc.c			optional	rc
-i386/isa/rp.c			optional	rp
-i386/isa/scd.c			optional	scd
-i386/isa/si.c			optional	si
-i386/isa/si2_z280.c		optional	si
-i386/isa/si3_t225.c		optional	si
-i386/isa/sound/ad1848.c		optional	css
-i386/isa/sound/ad1848.c		optional	gus
-i386/isa/sound/ad1848.c		optional	gusxvi
-i386/isa/sound/ad1848.c		optional	mss
-i386/isa/sound/ad1848.c		optional	sscape
-i386/isa/sound/ad1848.c		optional	trix
-i386/isa/sound/ad1848.c		optional	sscape_mss
-i386/isa/sound/adlib_card.c	optional	opl
-i386/isa/sound/adlib_card.c	optional	trix
-i386/isa/sound/audio.c		optional	snd
-i386/isa/sound/cs4232.c		optional	css
-i386/isa/sound/dev_table.c	optional	snd
-i386/isa/sound/dmabuf.c		optional	snd
-i386/isa/sound/gus_card.c	optional	gus
-i386/isa/sound/gus_midi.c	optional	gus
-i386/isa/sound/gus_vol.c	optional	gus
-i386/isa/sound/gus_wave.c	optional	gus
-i386/isa/sound/ics2101.c	optional	gus
-i386/isa/sound/midi_synth.c	optional	css
-i386/isa/sound/midi_synth.c	optional	gus
-i386/isa/sound/midi_synth.c	optional	mpu
-i386/isa/sound/midi_synth.c	optional	mss
-i386/isa/sound/midi_synth.c	optional	pas
-i386/isa/sound/midi_synth.c	optional	sb
-i386/isa/sound/midi_synth.c	optional	sscape
-i386/isa/sound/midi_synth.c	optional	uart
-i386/isa/sound/midibuf.c	optional	css
-i386/isa/sound/midibuf.c	optional	gus
-i386/isa/sound/midibuf.c	optional	mpu
-i386/isa/sound/midibuf.c	optional	mss
-i386/isa/sound/midibuf.c	optional	pas
-i386/isa/sound/midibuf.c	optional	sb
-i386/isa/sound/midibuf.c	optional	sscape
-i386/isa/sound/midibuf.c	optional	uart
-i386/isa/sound/mpu401.c		optional	mpu
-i386/isa/sound/mpu401.c		optional	sscape
-i386/isa/sound/opl3.c		optional	opl
-i386/isa/sound/opl3.c		optional	trix
-i386/isa/sound/pas2_card.c	optional	pas
-i386/isa/sound/pas2_midi.c	optional	pas
-i386/isa/sound/pas2_mixer.c	optional	pas
-i386/isa/sound/pas2_pcm.c	optional	pas
-i386/isa/sound/patmgr.c		optional	snd
-i386/isa/sound/sb16_dsp.c	optional	sbxvi
-i386/isa/sound/sb16_midi.c	optional	sbmidi
-i386/isa/sound/sb_card.c	optional	sb
-i386/isa/sound/sb_dsp.c		optional	sb
-i386/isa/sound/sb_midi.c	optional	sb
-i386/isa/sound/sb_mixer.c	optional	sb
-i386/isa/sound/sequencer.c	optional	snd
-i386/isa/sound/sound_switch.c	optional	snd
-i386/isa/sound/sound_timer.c	optional	css
-i386/isa/sound/sound_timer.c	optional	gus
-i386/isa/sound/sound_timer.c	optional	mss
-i386/isa/sound/sound_timer.c	optional	mss
-i386/isa/sound/sound_timer.c	optional	sscape
-i386/isa/sound/sound_timer.c	optional	trix
-i386/isa/sound/soundcard.c	optional	snd
-i386/isa/sound/sscape.c		optional	sscape
-i386/isa/sound/sys_timer.c	optional	snd
-i386/isa/sound/trix.c		optional	trix
-i386/isa/sound/uart6850.c	optional	uart
-i386/isa/spigot.c		optional	spigot
-i386/isa/spkr.c			optional	speaker
-i386/isa/stallion.c		optional	stl
-i386/isa/tw.c			optional	tw
-i386/isa/vesa.c			optional	vga
-i386/isa/wd.c			optional	wd	\
-	warning "The wd  driver is obsolete.  Please use the atadisk driver!"
-i386/isa/wd.c			optional	wdc
-i386/isa/wfd.c			optional	wfd	\
-	warning "The wfd driver is obsolete.  Please use the atapifd driver!"
-i386/isa/wst.c			optional	wst	\
-	warning "The wst driver is obsolete.  Please use the atapist driver!"
-i386/isa/wt.c			optional	wt
-i386/linux/imgact_linux.c	optional	compat_linux
-i386/linux/linux_dummy.c	optional	compat_linux
-i386/linux/linux_file.c		optional	compat_linux
-i386/linux/linux_ioctl.c	optional	compat_linux
-i386/linux/linux_ipc.c		optional	compat_linux
-i386/linux/linux_locore.s	optional	compat_linux		   \
-	dependency 	"linux_assym.h"
-i386/linux/linux_mib.c		optional	compat_linux
-i386/linux/linux_misc.c		optional	compat_linux
-i386/linux/linux_signal.c	optional	compat_linux
-i386/linux/linux_socket.c	optional	compat_linux
-i386/linux/linux_stats.c	optional	compat_linux
-i386/linux/linux_sysent.c	optional	compat_linux
-i386/linux/linux_sysvec.c	optional	compat_linux
-i386/linux/linux_util.c		optional	compat_linux
-svr4/imgact_svr4.c		optional	compat_svr4
-svr4/svr4_fcntl.c		optional	compat_svr4
-svr4/svr4_filio.c		optional	compat_svr4
-svr4/svr4_ioctl.c		optional	compat_svr4
-svr4/svr4_ipc.c			optional	compat_svr4
-svr4/svr4_misc.c		optional	compat_svr4
-svr4/svr4_resource.c		optional	compat_svr4
-svr4/svr4_signal.c		optional	compat_svr4
-svr4/svr4_socket.c		optional	compat_svr4
-svr4/svr4_sockio.c		optional	compat_svr4
-svr4/svr4_stat.c		optional	compat_svr4
-svr4/svr4_stream.c		optional	compat_svr4
-svr4/svr4_syscallnames.c	optional	compat_svr4
-svr4/svr4_sysent.c		optional	compat_svr4
-svr4/svr4_sysvec.c		optional	compat_svr4
-svr4/svr4_termios.c		optional	compat_svr4
-svr4/svr4_ttold.c		optional	compat_svr4
-i386/svr4/svr4_locore.s		optional	compat_svr4		   \
-	dependency	"svr4_assym.h"
-i386/svr4/svr4_machdep.c	optional	compat_svr4
-i4b/layer1/i4b_asuscom_ipac.c	optional	isic
-i4b/layer1/i4b_avm_a1.c		optional	isic
-i4b/layer1/i4b_avm_fritz_pci.c	optional	isic
-#i4b/layer1/i4b_avm_fritz_pcmcia.c optional	isic
-#i4b/layer1/i4b_avm_fritz_pnp.c	optional	isic
-i4b/layer1/i4b_bchan.c		optional	isic
-i4b/layer1/i4b_ctx_s0P.c	optional	isic
-i4b/layer1/i4b_drn_ngo.c	optional	isic
-#i4b/layer1/i4b_dynalink.c	optional	isic
-i4b/layer1/i4b_elsa_qs1i.c	optional	isic
-i4b/layer1/i4b_elsa_qs1p.c	optional	isic
-i4b/layer1/i4b_elsa_pcc16.c	optional	isic
-i4b/layer1/i4b_hscx.c		optional	isic
-i4b/layer1/i4b_isac.c		optional	isic
-i4b/layer1/i4b_isic.c		optional	isic
-i4b/layer1/i4b_isic_isa.c	optional	isic
-#i4b/layer1/i4b_isic_pcmcia.c	optional	isic
-i4b/layer1/i4b_isic_pnp.c	optional	isic
-#i4b/layer1/i4b_itk_ix1.c	optional	isic
-i4b/layer1/i4b_l1.c		optional	isic
-i4b/layer1/i4b_l1fsm.c		optional	isic
-i4b/layer1/i4b_siemens_isurf.c	optional	isic
-i4b/layer1/i4b_sws.c		optional	isic
-i4b/layer1/i4b_tel_s016.c	optional	isic
-i4b/layer1/i4b_tel_s0163.c	optional	isic
-i4b/layer1/i4b_tel_s08.c	optional	isic
-#i4b/layer1/i4b_usr_sti.c	optional	isic
-isa/atkbd_isa.c			optional	atkbd
-isa/atkbdc_isa.c		optional	atkbdc
-isa/psm.c			optional	psm
-isa/sio.c			optional	sio
-isa/syscons_isa.c		optional	sc
-isa/vga_isa.c			optional	vga
-kern/subr_diskmbr.c		standard
-libkern/divdi3.c		standard
-libkern/moddi3.c		standard
-libkern/qdivrem.c		standard
-libkern/udivdi3.c		standard
-libkern/umoddi3.c		standard
-pci/ide_pci.c			optional	wdc pci
diff --git a/sys/i386/conf/kernel.script b/sys/i386/conf/kernel.script
deleted file mode 100644
index 62ca43d..0000000
--- a/sys/i386/conf/kernel.script
+++ /dev/null
@@ -1,128 +0,0 @@
-OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
-OUTPUT_ARCH(i386)
-ENTRY(btext)
-SEARCH_DIR(/usr/lib);
-SECTIONS
-{
-  /* Read-only sections, merged into text segment: */
-  . = 0xc0100000 + SIZEOF_HEADERS;
-  .interp     : { *(.interp) 	}
-  .hash          : { *(.hash)		}
-  .dynsym        : { *(.dynsym)		}
-  .dynstr        : { *(.dynstr)		}
-  .gnu.version   : { *(.gnu.version)	}
-  .gnu.version_d   : { *(.gnu.version_d)	}
-  .gnu.version_r   : { *(.gnu.version_r)	}
-  .rel.text      :
-    { *(.rel.text) *(.rel.gnu.linkonce.t*) }
-  .rela.text     :
-    { *(.rela.text) *(.rela.gnu.linkonce.t*) }
-  .rel.data      :
-    { *(.rel.data) *(.rel.gnu.linkonce.d*) }
-  .rela.data     :
-    { *(.rela.data) *(.rela.gnu.linkonce.d*) }
-  .rel.rodata    :
-    { *(.rel.rodata) *(.rel.gnu.linkonce.r*) }
-  .rela.rodata   :
-    { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
-  .rel.got       : { *(.rel.got)		}
-  .rela.got      : { *(.rela.got)		}
-  .rel.ctors     : { *(.rel.ctors)	}
-  .rela.ctors    : { *(.rela.ctors)	}
-  .rel.dtors     : { *(.rel.dtors)	}
-  .rela.dtors    : { *(.rela.dtors)	}
-  .rel.init      : { *(.rel.init)	}
-  .rela.init     : { *(.rela.init)	}
-  .rel.fini      : { *(.rel.fini)	}
-  .rela.fini     : { *(.rela.fini)	}
-  .rel.bss       : { *(.rel.bss)		}
-  .rela.bss      : { *(.rela.bss)		}
-  .rel.plt       : { *(.rel.plt)		}
-  .rela.plt      : { *(.rela.plt)		}
-  .init          : { *(.init)	} =0x9090
-  .plt      : { *(.plt)	}
-  .text      :
-  {
-    *(.text)
-    *(.stub)
-    /* .gnu.warning sections are handled specially by elf32.em.  */
-    *(.gnu.warning)
-    *(.gnu.linkonce.t*)
-  } =0x9090
-  _etext = .;
-  PROVIDE (etext = .);
-  .fini      : { *(.fini)    } =0x9090
-  .rodata    : { *(.rodata) *(.gnu.linkonce.r*) }
-  .rodata1   : { *(.rodata1) }
-  /* Adjust the address for the data segment.  We want to adjust up to
-     the same address within the page on the next page up.  */
-  . = ALIGN(0x1000) + (. & (0x1000 - 1)) ; 
-  .data    :
-  {
-    *(.data)
-    *(.gnu.linkonce.d*)
-    CONSTRUCTORS
-  }
-  .data1   : { *(.data1) }
-  .ctors         :
-  {
-    *(.ctors)
-  }
-  .dtors         :
-  {
-    *(.dtors)
-  }
-  .got           : { *(.got.plt) *(.got) }
-  .dynamic       : { *(.dynamic) }
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata     : { *(.sdata) }
-  _edata  =  .;
-  PROVIDE (edata = .);
-  __bss_start = .;
-  .sbss      : { *(.sbss) *(.scommon) }
-  .bss       :
-  {
-   *(.dynbss)
-   *(.bss)
-   *(COMMON)
-  }
-  . = ALIGN(32 / 8);
-  _end = . ;
-  PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-  /* These must appear regardless of  .  */
-}
diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386
deleted file mode 100644
index 1bd8511..0000000
--- a/sys/i386/conf/options.i386
+++ /dev/null
@@ -1,200 +0,0 @@
-# $FreeBSD$
-
-DISABLE_PSE
-IDE_DELAY
-USER_LDT
-MATH_EMULATE		opt_math_emulate.h
-GPL_MATH_EMULATE	opt_math_emulate.h
-PMAP_SHPGPERPROC	opt_pmap.h
-PPC_DEBUG		opt_ppc.h
-SHOW_BUSYBUFS
-PANIC_REBOOT_WAIT_TIME	opt_panic.h
-MAXMEM
-PERFMON			opt_perfmon.h
-POWERFAIL_NMI		opt_trap.h
-AUTO_EOI_1		opt_auto_eoi.h
-AUTO_EOI_2		opt_auto_eoi.h
-CONSPEED		opt_comconsole.h
-I586_PMC_GUPROF		opt_i586_guprof.h
-WLCACHE			opt_wavelan.h
-WLDEBUG			opt_wavelan.h
-
-# Options for emulators.  These should only be used at config time, so
-# they are handled like options for static file systems
-# (see src/sys/conf/options), except for broken debugging options.
-IBCS2			opt_dontuse.h
-COMPAT_LINUX		opt_dontuse.h
-DEBUG_LINUX		opt_linux.h
-COMPAT_SVR4		opt_dontuse.h
-DEBUG_SVR4		opt_svr4.h
-
-# i386 SMP options
-APIC_IO			opt_global.h
-NAPIC			opt_smp.h
-NINTR			opt_smp.h
-
-CLK_CALIBRATION_LOOP		opt_clock.h
-CLK_USE_I8254_CALIBRATION	opt_clock.h
-CLK_USE_TSC_CALIBRATION		opt_clock.h
-TIMER_FREQ			opt_clock.h
-
-NO_F00F_HACK			opt_cpu.h
-CPU_BLUELIGHTNING_FPU_OP_CACHE	opt_cpu.h
-CPU_BLUELIGHTNING_3X		opt_cpu.h
-CPU_BTB_EN			opt_cpu.h
-CPU_CYRIX_NO_LOCK		opt_cpu.h
-CPU_DIRECT_MAPPED_CACHE		opt_cpu.h
-CPU_DISABLE_5X86_LSSER		opt_cpu.h
-CPU_FASTER_5X86_FPU		opt_cpu.h
-CPU_I486_ON_386			opt_cpu.h
-CPU_IORT			opt_cpu.h
-CPU_LOOP_EN			opt_cpu.h
-CPU_RSTK_EN			opt_cpu.h
-CPU_SUSP_HLT			opt_cpu.h
-CPU_UPGRADE_HW_CACHE		opt_cpu.h
-CPU_WT_ALLOC			opt_cpu.h
-CYRIX_CACHE_WORKS		opt_cpu.h
-CYRIX_CACHE_REALLY_WORKS	opt_cpu.h
-NO_MEMORY_HOLE			opt_cpu.h
-
-# The CPU type affects the endian conversion functions all over the kernel.
-I386_CPU		opt_global.h
-I486_CPU		opt_global.h
-I586_CPU		opt_global.h
-I686_CPU		opt_global.h
-
-MAXCONS			opt_syscons.h
-SC_ALT_MOUSE_IMAGE	opt_syscons.h
-SC_DEBUG_LEVEL		opt_syscons.h
-SC_DFLT_FONT		opt_syscons.h
-SC_DISABLE_DDBKEY	opt_syscons.h
-SC_DISABLE_REBOOT	opt_syscons.h
-SC_HISTORY_SIZE		opt_syscons.h
-SC_KERNEL_CONS_ATTR	opt_syscons.h
-SC_KERNEL_CONS_REV_ATTR	opt_syscons.h
-SC_MOUSE_CHAR		opt_syscons.h
-SC_NO_CUTPASTE		opt_syscons.h
-SC_NO_FONT_LOADING	opt_syscons.h
-SC_NO_HISTORY		opt_syscons.h
-SC_NO_SYSMOUSE		opt_syscons.h
-SC_NORM_ATTR		opt_syscons.h
-SC_NORM_REV_ATTR	opt_syscons.h
-SC_PIXEL_MODE		opt_syscons.h
-SC_RENDER_DEBUG		opt_syscons.h
-SC_TWOBUTTON_MOUSE	opt_syscons.h
-
-VGA_ALT_SEQACCESS	opt_vga.h
-VGA_DEBUG		opt_vga.h
-VGA_NO_FONT_LOADING	opt_vga.h
-VGA_NO_MODE_CHANGE	opt_vga.h
-VGA_SLOW_IOACCESS	opt_vga.h
-VGA_WIDTH90		opt_vga.h
-
-VESA			opt_vesa.h
-VESA_DEBUG		opt_vesa.h
-
-PSM_HOOKRESUME		opt_psm.h
-PSM_RESETAFTERSUSPEND	opt_psm.h
-PSM_DEBUG		opt_psm.h
-
-PCIC_RESUME_RESET	opt_pcic.h
-
-ATKBD_DFLT_KEYMAP	opt_atkbd.h
-UKBD_DFLT_KEYMAP	opt_ukbd.h
-
-KBD_DISABLE_KEYMAP_LOAD	opt_kbd.h
-KBD_INSTALL_CDEV	opt_kbd.h
-KBD_MAXRETRY		opt_kbd.h
-KBD_MAXWAIT		opt_kbd.h
-KBD_RESETDELAY		opt_kbd.h
-KBDIO_DEBUG		opt_kbd.h
-
-USERCONFIG		opt_userconfig.h
-VISUAL_USERCONFIG	opt_userconfig.h
-INTRO_USERCONFIG	opt_userconfig.h
-
-EISA_SLOTS		opt_eisa.h
-
-FE_8BIT_SUPPORT		opt_fe.h
-
-# pcvt(4) has a bunch of options
-FAT_CURSOR		opt_pcvt.h
-XSERVER			opt_pcvt.h
-PCVT_24LINESDEF		opt_pcvt.h
-PCVT_CTRL_ALT_DEL	opt_pcvt.h
-PCVT_EMU_MOUSE		opt_pcvt.h
-PCVT_FREEBSD		opt_pcvt.h
-PCVT_META_ESC		opt_pcvt.h
-PCVT_NSCREENS		opt_pcvt.h
-PCVT_PRETTYSCRNS	opt_pcvt.h
-PCVT_SCANSET		opt_pcvt.h
-PCVT_SCREENSAVER	opt_pcvt.h
-PCVT_USEKBDSEC		opt_pcvt.h
-PCVT_VT220KEYB		opt_pcvt.h
-
-# voxware options
-GUS_DMA2		opt_sound.h
-GUS_DMA			opt_sound.h
-GUS_IRQ			opt_sound.h
-
-# Video spigot
-SPIGOT_UNSECURE		opt_spigot.h
-
-# -------------------------------
-# isdn4bsd: passive ISA cards
-# -------------------------------
-TEL_S0_8		opt_i4b.h
-TEL_S0_16		opt_i4b.h
-TEL_S0_16_3		opt_i4b.h
-AVM_A1			opt_i4b.h
-USR_STI			opt_i4b.h
-#ITKIX1			opt_i4b.h
-ELSA_PCC16		opt_i4b.h
-# -------------------------------
-# isdn4bsd: passive ISA PnP cards
-# -------------------------------
-CRTX_S0_P		opt_i4b.h
-DRN_NGO                 opt_i4b.h
-TEL_S0_16_3_P		opt_i4b.h
-SEDLBAUER		opt_i4b.h
-#DYNALINK		opt_i4b.h
-ASUSCOM_IPAC		opt_i4b.h
-ELSA_QS1ISA		opt_i4b.h
-#AVM_PNP		opt_i4b.h
-SIEMENS_ISURF2		opt_i4b.h
-# -------------------------------
-# isdn4bsd: passive PCI cards
-# -------------------------------
-ELSA_QS1PCI		opt_i4b.h
-AVM_A1_PCI		opt_i4b.h
-# -------------------------------
-# isdn4bsd: passive PCMCIA cards
-# -------------------------------
-#AVM_A1_PCMCIA		opt_i4b.h
-# -------------------------------
-# isdn4bsd: misc options
-# -------------------------------
-# temporary workaround for SMP machines
-I4B_SMP_WORKAROUND      opt_i4b.h
-# enable VJ compression code for ipr i/f
-IPR_VJ			opt_i4b.h
-IPR_LOG			opt_i4b.h
-
-# -------------------------------
-# oltr: build options
-# -------------------------------
-# Exclude microcode options
-OLTR_NO_TMS_MAC		opt_oltr.h
-OLTR_NO_HAWKEYE_MAC	opt_oltr.h
-OLTR_NO_BULLSEYE_MAC	opt_oltr.h
-
-# Total number of ports controlled by the dgb(4) driver.
-# Defaults to NDGB*16.
-NDGBPORTS		opt_dgb.h
-
-# Temporary options for moving to pnpbios
-PNPBIOS			opt_pnp.h
-
-# -------------------------------
-# EOF
-# -------------------------------
diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98
deleted file mode 100644
index 9c8620e..0000000
--- a/sys/pc98/conf/Makefile.pc98
+++ /dev/null
@@ -1,255 +0,0 @@
-# Makefile for FreeBSD(98) after:
-#
-# Makefile.i386 -- with config changes.
-# Copyright 1990 W. Jolitz
-#	from: @(#)Makefile.i386	7.1 5/10/91
-# $FreeBSD$
-#
-# Makefile for FreeBSD
-#
-# This makefile is constructed from a machine description:
-#	config machineid
-# Most changes should be made in the machine description
-#	/sys/i386/conf/``machineid''
-# after which you should do
-#	 config machineid
-# Generic makefile changes should be made in
-#	/sys/i386/conf/Makefile.i386
-# after which config should be rerun for all machines.
-#
-
-# Which version of config(8) is required.
-%VERSREQ=	400017
-
-# Can be overridden by makeoptions or /etc/make.conf
-KERNEL?=	kernel
-#STD8X16FONT?=	iso
-
-.if !defined(S)
-.if exists(./@/.)
-S=	./@
-.else
-S=	../..
-.endif
-.endif
-PC98=	${S}/pc98
-M=	${MACHINE_ARCH}
-
-SIZE?=	size
-
-COPTFLAGS?=-O
-INCLUDES= -nostdinc -I- -I. -I$S
-# This hack is to allow kernel compiles to succeed on machines w/out srcdist
-.if exists($S/../include)
-INCLUDES+= -I$S/../include
-.else
-INCLUDES+= -I/usr/include
-.endif
-COPTS=	${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h
-CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
-
-# XXX LOCORE means "don't declare C stuff" not "for locore.s".
-ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
-
-# Select the correct set of tools. Can't set OBJFORMAT here because it
-# doesn't get exported into the environment, and if it were exported
-# then it might break building of utilities.
-FMT=		-elf
-CFLAGS+=	${FMT}
-
-LOAD_ADDRESS?=	C0100000
-DEFINED_PROF=	${PROF}
-.if defined(PROF)
-CFLAGS+=	-malign-functions=4
-.if ${PROFLEVEL} >= 2
-IDENT+=	-DGPROF4 -DGUPROF
-PROF+=	-mprofiler-epilogue
-.endif
-.endif
-
-# Put configuration-specific C flags last (except for ${PROF}) so that they
-# can override the others.
-CFLAGS+=	${CONF_CFLAGS}
-
-NORMAL_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
-NORMAL_C_C= ${CC} -c ${CFLAGS} ${PROF} ${.IMPSRC}
-NORMAL_S= ${CC} -c ${ASM_CFLAGS} ${.IMPSRC}
-PROFILE_C= ${CC} -c ${CFLAGS} ${.IMPSRC}
-
-GEN_CFILES= $S/$M/$M/genassym.c
-# setdef0.c and setdef1.c are intentionally
-# omitted from SYSTEM_CFILES.  They include setdefs.h, a header which
-# is generated from all of ${OBJS}.  We don't want to have to compile
-# everything just to do a make depend.
-SYSTEM_CFILES= ioconf.c param.c vnode_if.c config.c
-SYSTEM_SFILES= $S/$M/$M/locore.s
-SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
-SYSTEM_OBJS= locore.o setdef0.o vnode_if.o ${OBJS} ioconf.o param.o config.o \
-	setdef1.o hack.So
-SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/$M/conf/kernel.script \
-	-export-dynamic -dynamic-linker /red/herring \
-	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
-SYSTEM_LD_TAIL= @${SIZE} ${FMT} ${.TARGET} ; chmod 755 ${.TARGET}
-SYSTEM_DEP+= $S/$M/conf/kernel.script
-
-%BEFORE_DEPEND
-
-%OBJS
-
-%CFILES
-
-%SFILES
-
-%MFILES
-
-%CLEAN
-
-all: ${KERNEL}
-
-.if !defined(DEBUG)
-FULLKERNEL=	${KERNEL}
-.else
-FULLKERNEL=	${KERNEL}.debug
-${KERNEL}: ${FULLKERNEL}
-	objcopy --strip-debug ${FULLKERNEL} ${KERNEL}
-.endif
-
-${FULLKERNEL}: ${SYSTEM_DEP} vers.o
-	@rm -f ${.TARGET}
-	@echo linking ${.TARGET}
-	${SYSTEM_LD}
-	${SYSTEM_LD_TAIL}
-
-.if !exists(.depend)
-${SYSTEM_OBJS}: vnode_if.h ${BEFORE_DEPEND:M*.h}
-.endif
-
-clean:
-	rm -f *.o *.so *.So *.ko *.s eddep errs genassym \
-	      ${FULLKERNEL} ${KERNEL} linterrs makelinks param.c \
-	      setdef[01].c setdefs.h tags \
-	      vers.c vnode_if.c vnode_if.h ${CLEAN}
-
-#lint: /tmp param.c
-#	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \
-#	  $S/$M/$M/Locore.c ${CFILES} ioconf.c param.c | \
-#	    grep -v 'struct/union .* never defined' | \
-#	    grep -v 'possible pointer alignment problem'
-
-locore.o: $S/$M/$M/locore.s assym.s
-	${NORMAL_S}
-
-# This is a hack.  BFD "optimizes" away dynamic mode if there are no
-# dynamic references.  We could probably do a '-Bforcedynamic' mode like
-# in the a.out ld.  For now, this works.
-hack.So: Makefile
-	touch hack.c
-	${CC} ${FMT} -shared -nostdlib hack.c -o hack.So
-	rm -f hack.c
-
-.ORDER: setdefs.h setdef0.c setdef1.c
-
-setdef0.o: setdef0.c setdefs.h
-	${NORMAL_C}
-
-setdef1.o: setdef1.c setdefs.h
-	${NORMAL_C}
-
-setdef0.c setdef1.c setdefs.h: ${OBJS}
-	@gensetdefs ${OBJS}
-
-# this rule stops ./assym.s in .depend from causing problems
-./assym.s: assym.s
-
-assym.s: genassym.o
-	genassym genassym.o >assym.s
-
-genassym.o: $S/$M/$M/genassym.c
-	rm -f ./machine ; ln -s $S/$M/include ./machine
-	${CC} -c ${CFLAGS} $S/$M/$M/genassym.c
-
-${SYSTEM_OBJS} genassym.o vers.o: opt_global.h
-
-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
-	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} ${SYSTEM_SFILES}
-	rm -f .newdep
-	mkdep -a -f .newdep ${CFLAGS} ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES}
-	env MKDEP_CPP="${CC} -E" \
-	    mkdep -a -f .newdep ${ASM_CFLAGS} ${SFILES} ${SYSTEM_SFILES}
-	rm -f .depend
-	mv -f .newdep .depend
-
-cleandepend:
-	rm -f .depend
-
-links:
-	egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
-	  sed -e 's/:.*//' -e 's/\.c/.o/' | sort -u > dontlink
-	echo ${CFILES} | tr -s ' ' '\12' | sed 's/\.c/.o/' | \
-	  sort -u | comm -23 - dontlink | \
-	  sed 's,../.*/\(.*.o\),rm -f \1;ln -s ../GENERIC/\1 \1,' > makelinks
-	sh makelinks && rm -f dontlink
-
-tags:
-	@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
-	sh $S/conf/systags.sh
-	rm -f tags1
-	sed -e 's,      ../,    ,' tags > tags1
-
-install install.debug:
-	@if [ ! -f ${KERNEL}${.TARGET:S/install//} ] ; then \
-		echo "You must build a kernel first." ; \
-		exit 1 ; \
-	fi
-.if exists(${DESTDIR}/${KERNEL})
-	-chflags noschg ${DESTDIR}/${KERNEL}
-	mv ${DESTDIR}/${KERNEL} ${DESTDIR}/${KERNEL}.old
-.endif
-	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL}${.TARGET:S/install//} ${DESTDIR}/${KERNEL}
-
-reinstall reinstall.debug:
-	install -c -m 555 -o root -g wheel -fschg \
-		${KERNEL}${.TARGET:S/reinstall//} ${DESTDIR}/${KERNEL}
-
-config.o:
-	${NORMAL_C}
-
-ioconf.o:
-	${NORMAL_C}
-
-param.c: $S/conf/param.c
-	-rm -f param.c
-	cp $S/conf/param.c .
-
-param.o:
-	${NORMAL_C}
-
-vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
-	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
-
-# XXX strictly, everything depends on Makefile because changes to ${PROF}
-# only appear there, but we don't handle that.
-vers.o:
-	${NORMAL_C}
-
-vnode_if.c: $S/kern/vnode_if.pl $S/kern/vnode_if.src
-	perl5 $S/kern/vnode_if.pl -c $S/kern/vnode_if.src
-
-vnode_if.h: $S/kern/vnode_if.pl $S/kern/vnode_if.src
-	perl5 $S/kern/vnode_if.pl -h $S/kern/vnode_if.src
-
-vnode_if.o:
-	${NORMAL_C}
-
-# Commented out for now pending a better solution.
-# How do we pick up compiler version specific flags??
-#.if exists($S/../share/mk)
-#.include "$S/../share/mk/bsd.kern.mk"
-#.else
-.include <bsd.kern.mk>
-#.endif
-
-%RULES
-
-# DO NOT DELETE THIS LINE -- make depend uses it
diff --git a/sys/pc98/conf/files.pc98 b/sys/pc98/conf/files.pc98
deleted file mode 100644
index e9b33c8..0000000
--- a/sys/pc98/conf/files.pc98
+++ /dev/null
@@ -1,405 +0,0 @@
-# This file tells config what files go into building a kernel,
-# files marked standard are always included.
-#
-# modified for PC-9801
-#
-# $FreeBSD$
-#
-# The long compile-with and dependency lines are required because of
-# limitations in config: backslash-newline doesn't work in strings, and
-# dependency lines other than the first are silently ignored.
-#
-linux_genassym.o		optional	compat_linux		   \
-	dependency 	"$S/i386/linux/linux_genassym.c"		   \
-	compile-with	"${CC} ${CFLAGS} -c ${.IMPSRC}"			   \
-	no-obj no-implicit-rule						   \
-	clean		"linux_genassym.o"
-#
-svr4_genassym.o			optional	compat_svr4		   \
-	dependency 	"$S/i386/svr4/svr4_genassym.c"			   \
-	compile-with	"${CC} ${CFLAGS} -c ${.IMPSRC}"			   \
-	no-obj no-implicit-rule						   \
-	clean		"svr4_genassym.o"
-#
-linux_assym.h			optional	compat_linux		   \
-	dependency 	"linux_genassym.o"				   \
-	compile-with	"genassym linux_genassym.o > ${.TARGET}"	   \
-	no-obj no-implicit-rule before-depend				   \
-	clean		"linux_assym.h"
-#
-svr4_assym.h			optional	compat_svr4		   \
-	dependency 	"svr4_genassym.o"			   	   \
-	compile-with	"genassym svr4_genassym.o > ${.TARGET}"		   \
-	no-obj no-implicit-rule before-depend				   \
-	clean		"svr4_assym.h"
-#
-atkbdmap.h			optional	atkbd_dflt_keymap	\
-	compile-with	"kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h"				\
-	no-obj no-implicit-rule before-depend				\
-	clean		"atkbdmap.h"
-#
-ukbdmap.h			optional	ukbd_dflt_keymap	\
-	compile-with	"kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"				\
-	no-obj no-implicit-rule before-depend				\
-	clean		"ukbdmap.h"
-#
-contrib/dev/fla/fla.c		optional	fla
-msysosak.o			optional	fla			\
-	dependency	"$S/contrib/dev/fla/i386/msysosak.o.uu" 		\
-	compile-with	"uudecode < $S/contrib/dev/fla/i386/msysosak.o.uu"	\
-	no-implicit-rule
-#
-contrib/dev/oltr/if_oltr.c	optional	oltr
-trlld.o				optional	oltr			\
-	dependency	"$S/contrib/dev/oltr/i386${FMT}.trlld.o.uu"	\
-	compile-with	"uudecode < $S/contrib/dev/oltr/i386${FMT}.trlld.o.uu"	\
-	no-implicit-rule
-contrib/dev/oltr/trlldbm.c	optional	oltr
-contrib/dev/oltr/trlldhm.c	optional	oltr
-contrib/dev/oltr/trlldmac.c	optional	oltr
-dev/ata/ata-all.c		optional	ata 
-dev/ata/ata-dma.c		optional	ata 
-dev/ata/ata-disk.c		optional	atadisk
-dev/ata/atapi-all.c		optional	atapicd 
-dev/ata/atapi-all.c		optional	atapifd 
-dev/ata/atapi-all.c		optional	atapist
-dev/ata/atapi-cd.c		optional	atapicd
-dev/ata/atapi-fd.c		optional	atapifd
-dev/ata/atapi-tape.c		optional	atapist
-dev/fb/fb.c			optional	fb
-dev/fb/fb.c			optional	gdc
-dev/fb/splash.c			optional	splash
-dev/kbd/kbd.c			optional	kbd
-dev/kbd/kbd.c			optional	sc
-dev/kbd/kbd.c			optional	ukbd
-dev/kbd/kbd.c			optional	pckbd
-dev/pccard/if_xe.c		optional	xe
-dev/sound/isa/ad1816.c		optional	pcm isa
-dev/sound/isa/es1888.c		optional	pcm isa
-dev/sound/isa/gusc.c		optional	gusc isa
-dev/sound/isa/mss.c		optional	pcm isa
-dev/sound/isa/sb.c		optional	pcm isa
-dev/sound/isa/sbc.c		optional	sbc
-gnu/i386/fpemul/div_small.s	optional	gpl_math_emulate
-gnu/i386/fpemul/errors.c	optional	gpl_math_emulate
-gnu/i386/fpemul/fpu_arith.c	optional	gpl_math_emulate
-gnu/i386/fpemul/fpu_aux.c	optional	gpl_math_emulate
-gnu/i386/fpemul/fpu_entry.c	optional	gpl_math_emulate
-gnu/i386/fpemul/fpu_etc.c	optional	gpl_math_emulate
-gnu/i386/fpemul/fpu_trig.c	optional	gpl_math_emulate
-gnu/i386/fpemul/get_address.c	optional	gpl_math_emulate
-gnu/i386/fpemul/load_store.c	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_2xm1.c	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_atan.c	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_div.s	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_l2.c	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_mul64.s	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_sin.c	optional	gpl_math_emulate
-gnu/i386/fpemul/poly_tan.c	optional	gpl_math_emulate
-gnu/i386/fpemul/polynomial.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_add_sub.c	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_compare.c	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_constant.c	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_div.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_ld_str.c	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_mul.c	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_norm.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_round.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_u_add.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_u_div.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_u_mul.s	optional	gpl_math_emulate
-gnu/i386/fpemul/reg_u_sub.s	optional	gpl_math_emulate
-gnu/i386/fpemul/wm_shrx.s	optional	gpl_math_emulate
-gnu/i386/fpemul/wm_sqrt.s	optional	gpl_math_emulate
-gnu/i386/isa/dgb.c		optional	dgb
-gnu/i386/isa/dgm.c		optional	dgm
-gnu/i386/isa/sound/awe_wave.c	optional	awe
-i386/apm/apm.c			optional	apm
-#i386/eisa/adv_eisa.c		optional	adv
-i386/eisa/ahb.c			optional	ahb
-i386/eisa/ahc_eisa.c		optional	eisa ahc    \
-	dependency	"aic7xxx_reg.h $S/i386/eisa/ahc_eisa.c"
-i386/eisa/eisaconf.c		optional	eisa
-i386/eisa/if_fea.c		optional	fea
-i386/eisa/if_vx_eisa.c		optional	vx
-i386/i386/atomic.c		standard				\
-	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
-i386/i386/autoconf.c		standard
-i386/i386/bios.c		standard
-i386/i386/bioscall.s		standard
-i386/i386/busdma_machdep.c	standard
-i386/i386/db_disasm.c		optional	ddb
-i386/i386/db_interface.c	optional	ddb
-i386/i386/db_trace.c		optional	ddb
-i386/i386/elf_machdep.c		standard
-i386/i386/exception.s		standard
-i386/i386/globals.s		standard
-i386/i386/i386-gdbstub.c	optional	ddb
-i386/i386/i686_mem.c		standard
-i386/i386/identcpu.c		standard
-i386/i386/in_cksum.c		optional	inet
-i386/i386/initcpu.c		standard
-#i386/i386/k6_mem.c		standard
-# locore.s needs to be handled in Makefile to put it first.  Otherwise it's
-# now normal.
-# i386/i386/locore.s		standard
-pc98/i386/machdep.c		standard
-i386/i386/math_emulate.c	optional	math_emulate
-i386/i386/mem.c			standard
-i386/i386/mp_clock.c		optional	smp
-i386/i386/mp_machdep.c		optional	smp
-i386/i386/mpapic.c		optional	smp
-i386/i386/mpboot.s		optional	smp
-i386/i386/mplock.s		optional	smp
-i386/i386/nexus.c		standard
-i386/i386/perfmon.c		optional	perfmon
-i386/i386/perfmon.c		optional	perfmon	profiling-routine
-i386/i386/pmap.c		standard
-i386/i386/procfs_machdep.c	standard
-i386/i386/simplelock.s		optional	smp
-i386/i386/support.s		standard
-i386/i386/swtch.s		standard
-i386/i386/sys_machdep.c		standard
-i386/i386/trap.c		standard
-pc98/i386/userconfig.c		optional	userconfig
-i386/i386/vm86.c		standard
-i386/i386/vm_machdep.c		standard
-i386/ibcs2/ibcs2_errno.c	optional	ibcs2
-i386/ibcs2/ibcs2_fcntl.c	optional	ibcs2
-i386/ibcs2/ibcs2_ioctl.c	optional	ibcs2
-i386/ibcs2/ibcs2_ipc.c		optional	ibcs2
-i386/ibcs2/ibcs2_isc.c		optional	ibcs2
-i386/ibcs2/ibcs2_isc_sysent.c	optional	ibcs2
-i386/ibcs2/ibcs2_misc.c		optional	ibcs2
-i386/ibcs2/ibcs2_msg.c		optional	ibcs2
-i386/ibcs2/ibcs2_other.c	optional	ibcs2
-i386/ibcs2/ibcs2_signal.c	optional	ibcs2
-i386/ibcs2/ibcs2_socksys.c	optional	ibcs2
-i386/ibcs2/ibcs2_stat.c		optional	ibcs2
-i386/ibcs2/ibcs2_sysent.c	optional	ibcs2
-i386/ibcs2/ibcs2_sysi86.c	optional	ibcs2
-i386/ibcs2/ibcs2_sysvec.c	optional	ibcs2
-i386/ibcs2/ibcs2_util.c		optional	ibcs2
-i386/ibcs2/ibcs2_xenix.c	optional	ibcs2
-i386/ibcs2/ibcs2_xenix_sysent.c	optional	ibcs2
-i386/ibcs2/imgact_coff.c	optional	ibcs2
-pc98/pc98/pc98_machdep.c	standard
-i386/isa/bs/bs.c		optional	bs
-i386/isa/bs/bsfunc.c		optional	bs
-i386/isa/bs/bshw.c		optional	bs
-i386/isa/bs/bsif.c		optional	bs
-#i386/isa/adv_isa.c		optional	adv
-i386/isa/asc.c			optional	asc
-i386/isa/atapi-cd.c		optional	wcd
-pc98/pc98/atapi.c		optional	wdc
-pc98/pc98/clock.c		standard
-i386/isa/cronyx.c		optional	cx
-i386/isa/ctx.c			optional	ctx
-i386/isa/cx.c			optional	cx
-i386/isa/cy.c			optional	cy
-pc98/pc98/diskslice_machdep.c	standard
-i386/isa/elink.c		optional	ep
-i386/isa/elink.c		optional	ie
-pc98/pc98/fd.c			optional	fd
-i386/isa/gpib.c			optional	gp
-i386/isa/gsc.c			optional	gsc
-i386/isa/if_ar.c		optional	ar
-i386/isa/if_cs.c		optional	cs
-i386/isa/if_cx.c		optional	cx
-pc98/pc98/if_ed.c		optional	ed
-i386/isa/if_el.c		optional	el
-i386/isa/if_ex.c		optional	ex
-i386/isa/if_fe.c		optional	fe
-i386/isa/if_ie.c		optional	ie
-i386/isa/if_le.c		optional	le
-i386/isa/if_lnc.c		optional	lnc
-i386/isa/if_rdp.c		optional	rdp
-i386/isa/if_sr.c		optional	sr
-i386/isa/if_wi.c		optional	wi card
-i386/isa/if_wl.c		optional	wl
-i386/isa/intr_machdep.c		standard
-i386/isa/ipl_funcs.c		standard				   \
-	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}"
-i386/isa/isa.c			optional	isa
-pc98/pc98/isa_compat.c		optional	isa
-pc98/pc98/isa_dma.c		optional	isa
-i386/isa/istallion.c		optional	stli
-i386/isa/labpc.c		optional	labpc
-i386/isa/loran.c		optional	loran
-i386/isa/matcd/matcd.c		optional	matcd
-i386/isa/mca_machdep.c		optional	mca
-i386/isa/mcd.c			optional	mcd
-pc98/pc98/mse.c			optional	mse
-pc98/pc98/npx.c			mandatory	npx
-pc98/pc98/olpt.c		optional	olpt
-pc98/pc98/pc98gdc.c		optional	gdc
-pc98/pc98/pc98kbd.c		optional	pckbd
-pc98/pc98/pcaudio.c		optional	pca
-i386/isa/pcf.c			optional	pcf
-i386/isa/pcibus.c		optional	pci
-i386/isa/pcvt/pcvt_drv.c	optional	vt
-i386/isa/pcvt/pcvt_ext.c	optional	vt
-i386/isa/pcvt/pcvt_kbd.c	optional	vt
-i386/isa/pcvt/pcvt_out.c	optional	vt
-i386/isa/pcvt/pcvt_sup.c	optional	vt
-i386/isa/pcvt/pcvt_vtf.c	optional	vt
-pc98/pc98/ppc.c			optional	ppc
-i386/isa/prof_machdep.c		optional	profiling-routine
-i386/isa/random_machdep.c	standard
-i386/isa/rc.c			optional	rc
-i386/isa/rp.c			optional	rp
-i386/isa/scd.c			optional	scd
-i386/isa/si.c			optional	si
-i386/isa/si2_z280.c		optional	si
-i386/isa/si3_t225.c		optional	si
-pc98/pc98/sio.c			optional	sio
-i386/isa/sound/ad1848.c		optional	css
-i386/isa/sound/ad1848.c		optional	gus
-i386/isa/sound/ad1848.c		optional	gusxvi
-i386/isa/sound/ad1848.c		optional	mss
-i386/isa/sound/ad1848.c		optional	sscape
-i386/isa/sound/ad1848.c		optional	trix
-i386/isa/sound/ad1848.c		optional	sscape_mss
-i386/isa/sound/adlib_card.c	optional	opl
-i386/isa/sound/adlib_card.c	optional	trix
-i386/isa/sound/audio.c		optional	snd
-i386/isa/sound/cs4232.c		optional	css
-i386/isa/sound/dev_table.c	optional	snd
-i386/isa/sound/dmabuf.c		optional	snd
-i386/isa/sound/gus_card.c	optional	gus
-i386/isa/sound/gus_midi.c	optional	gus
-i386/isa/sound/gus_vol.c	optional	gus
-i386/isa/sound/gus_wave.c	optional	gus
-i386/isa/sound/ics2101.c	optional	gus
-i386/isa/sound/midi_synth.c	optional	css
-i386/isa/sound/midi_synth.c	optional	gus
-i386/isa/sound/midi_synth.c	optional	mpu
-i386/isa/sound/midi_synth.c	optional	mss
-i386/isa/sound/midi_synth.c	optional	pas
-i386/isa/sound/midi_synth.c	optional	sb
-i386/isa/sound/midi_synth.c	optional	sscape
-i386/isa/sound/midi_synth.c	optional	uart
-i386/isa/sound/midibuf.c	optional	css
-i386/isa/sound/midibuf.c	optional	gus
-i386/isa/sound/midibuf.c	optional	mpu
-i386/isa/sound/midibuf.c	optional	mss
-i386/isa/sound/midibuf.c	optional	nss
-i386/isa/sound/midibuf.c	optional	pas
-i386/isa/sound/midibuf.c	optional	sb
-i386/isa/sound/midibuf.c	optional	sscape
-i386/isa/sound/midibuf.c	optional	uart
-i386/isa/sound/mpu401.c		optional	mpu
-i386/isa/sound/mpu401.c		optional	sscape
-i386/isa/sound/opl3.c		optional	opl
-i386/isa/sound/opl3.c		optional	trix
-i386/isa/sound/pas2_card.c	optional	pas
-i386/isa/sound/pas2_midi.c	optional	pas
-i386/isa/sound/pas2_mixer.c	optional	pas
-i386/isa/sound/pas2_pcm.c	optional	pas
-i386/isa/sound/patmgr.c		optional	snd
-i386/isa/sound/pcm86.c		optional	nss
-i386/isa/sound/sb16_dsp.c	optional	sbxvi
-i386/isa/sound/sb16_midi.c	optional	sbmidi
-i386/isa/sound/sb_card.c	optional	sb
-i386/isa/sound/sb_dsp.c		optional	sb
-i386/isa/sound/sb_midi.c	optional	sb
-i386/isa/sound/sb_mixer.c	optional	sb
-i386/isa/sound/sequencer.c	optional	snd
-i386/isa/sound/sound_switch.c	optional	snd
-i386/isa/sound/sound_timer.c	optional	css
-i386/isa/sound/sound_timer.c	optional	gus
-i386/isa/sound/sound_timer.c	optional	mss
-i386/isa/sound/sound_timer.c	optional	mss
-i386/isa/sound/sound_timer.c	optional	sscape
-i386/isa/sound/sound_timer.c	optional	trix
-i386/isa/sound/soundcard.c	optional	snd
-i386/isa/sound/sscape.c		optional	sscape
-i386/isa/sound/sys_timer.c	optional	snd
-i386/isa/sound/trix.c		optional	trix
-i386/isa/sound/uart6850.c	optional	uart
-i386/isa/spigot.c		optional	spigot
-pc98/pc98/spkr.c		optional	speaker
-i386/isa/stallion.c		optional	stl
-pc98/pc98/syscons.c		optional	sc
-pc98/pc98/syscons_pc98.c	optional	sc
-dev/syscons/schistory.c		optional	sc
-dev/syscons/scmouse.c		optional	sc
-pc98/pc98/scgdcrndr.c		optional	sc
-dev/syscons/scvidctl.c		optional	sc
-pc98/pc98/scvtbpc98.c		optional	sc
-i386/isa/tw.c			optional	tw
-pc98/pc98/wd.c			optional	wdc
-pc98/pc98/wd.c			optional	wd
-i386/isa/wfd.c			optional	wfd
-i386/isa/wst.c			optional	wst
-i386/isa/wt.c			optional	wt
-i386/linux/imgact_linux.c	optional	compat_linux
-i386/linux/linux_dummy.c	optional	compat_linux
-i386/linux/linux_file.c		optional	compat_linux
-i386/linux/linux_ioctl.c	optional	compat_linux
-i386/linux/linux_ipc.c		optional	compat_linux
-i386/linux/linux_locore.s	optional	compat_linux		   \
-	dependency 	"linux_assym.h"
-i386/linux/linux_mib.c		optional	compat_linux
-i386/linux/linux_misc.c		optional	compat_linux
-i386/linux/linux_signal.c	optional	compat_linux
-i386/linux/linux_socket.c	optional	compat_linux
-i386/linux/linux_stats.c	optional	compat_linux
-i386/linux/linux_sysent.c	optional	compat_linux
-i386/linux/linux_sysvec.c	optional	compat_linux
-i386/linux/linux_util.c		optional	compat_linux
-svr4/imgact_svr4.c		optional	compat_svr4
-svr4/svr4_fcntl.c		optional	compat_svr4
-svr4/svr4_filio.c		optional	compat_svr4
-svr4/svr4_ioctl.c		optional	compat_svr4
-svr4/svr4_ipc.c			optional	compat_svr4
-svr4/svr4_misc.c		optional	compat_svr4
-svr4/svr4_resource.c		optional	compat_svr4
-svr4/svr4_signal.c		optional	compat_svr4
-svr4/svr4_socket.c		optional	compat_svr4
-svr4/svr4_sockio.c		optional	compat_svr4
-svr4/svr4_stat.c		optional	compat_svr4
-svr4/svr4_stream.c		optional	compat_svr4
-svr4/svr4_syscallnames.c	optional	compat_svr4
-svr4/svr4_sysent.c		optional	compat_svr4
-svr4/svr4_sysvec.c		optional	compat_svr4
-svr4/svr4_termios.c		optional	compat_svr4
-svr4/svr4_ttold.c		optional	compat_svr4
-i386/svr4/svr4_locore.s		optional	compat_svr4		   \
-	dependency	"svr4_assym.h"
-i386/svr4/svr4_machdep.c	optional	compat_svr4
-i4b/layer1/i4b_asuscom_ipac.c	optional	isic
-i4b/layer1/i4b_avm_a1.c		optional	isic
-i4b/layer1/i4b_avm_fritz_pci.c	optional	isic
-#i4b/layer1/i4b_avm_fritz_pcmcia.c optional	isic
-#i4b/layer1/i4b_avm_fritz_pnp.c	optional	isic
-i4b/layer1/i4b_bchan.c		optional	isic
-i4b/layer1/i4b_ctx_s0P.c	optional	isic
-i4b/layer1/i4b_drn_ngo.c	optional	isic
-#i4b/layer1/i4b_dynalink.c	optional	isic
-i4b/layer1/i4b_elsa_qs1i.c	optional	isic
-i4b/layer1/i4b_elsa_qs1p.c	optional	isic
-i4b/layer1/i4b_elsa_pcc16.c	optional	isic
-i4b/layer1/i4b_hscx.c		optional	isic
-i4b/layer1/i4b_isac.c		optional	isic
-i4b/layer1/i4b_isic.c		optional	isic
-i4b/layer1/i4b_isic_isa.c	optional	isic
-#i4b/layer1/i4b_isic_pcmcia.c	optional	isic
-i4b/layer1/i4b_isic_pnp.c	optional	isic
-#i4b/layer1/i4b_itk_ix1.c	optional	isic
-i4b/layer1/i4b_l1.c		optional	isic
-i4b/layer1/i4b_l1fsm.c		optional	isic
-i4b/layer1/i4b_siemens_isurf.c	optional	isic
-i4b/layer1/i4b_sws.c		optional	isic
-i4b/layer1/i4b_tel_s016.c	optional	isic
-i4b/layer1/i4b_tel_s0163.c	optional	isic
-i4b/layer1/i4b_tel_s08.c	optional	isic
-#i4b/layer1/i4b_usr_sti.c	optional	isic
-isa/psm.c			optional	psm
-kern/subr_diskmbr.c		optional	compat_atdisk
-libkern/divdi3.c		standard
-libkern/moddi3.c		standard
-libkern/qdivrem.c		standard
-libkern/udivdi3.c		standard
-libkern/umoddi3.c		standard
-#pci/ide_pci.c			optional	wd
diff --git a/sys/pc98/conf/options.pc98 b/sys/pc98/conf/options.pc98
deleted file mode 100644
index da48a7a..0000000
--- a/sys/pc98/conf/options.pc98
+++ /dev/null
@@ -1,202 +0,0 @@
-# $FreeBSD$
-
-DISABLE_PSE
-IDE_DELAY
-USER_LDT
-MATH_EMULATE		opt_math_emulate.h
-GPL_MATH_EMULATE	opt_math_emulate.h
-PMAP_SHPGPERPROC	opt_pmap.h
-PPC_DEBUG		opt_ppc.h
-SHOW_BUSYBUFS
-PANIC_REBOOT_WAIT_TIME	opt_panic.h
-MAXMEM
-PERFMON			opt_perfmon.h
-POWERFAIL_NMI		opt_trap.h
-AUTO_EOI_1		opt_auto_eoi.h
-AUTO_EOI_2		opt_auto_eoi.h
-CONSPEED		opt_comconsole.h
-I586_PMC_GUPROF		opt_i586_guprof.h
-WLCACHE			opt_wavelan.h
-WLDEBUG			opt_wavelan.h
-
-# Options for emulators.  These should only be used at config time, so
-# they are handled like options for static file systems
-# (see src/sys/conf/options), except for broken debugging options.
-IBCS2			opt_dontuse.h
-COMPAT_LINUX		opt_dontuse.h
-DEBUG_LINUX		opt_linux.h
-COMPAT_SVR4		opt_dontuse.h
-DEBUG_SVR4		opt_svr4.h
-
-# i386 SMP options
-APIC_IO			opt_global.h
-NAPIC			opt_smp.h
-NINTR			opt_smp.h
-
-CLK_CALIBRATION_LOOP		opt_clock.h
-CLK_USE_I8254_CALIBRATION	opt_clock.h
-CLK_USE_TSC_CALIBRATION		opt_clock.h
-TIMER_FREQ			opt_clock.h
-
-NO_F00F_HACK			opt_cpu.h
-CPU_BLUELIGHTNING_FPU_OP_CACHE	opt_cpu.h
-CPU_BLUELIGHTNING_3X		opt_cpu.h
-CPU_BTB_EN			opt_cpu.h
-CPU_CYRIX_NO_LOCK		opt_cpu.h
-CPU_DIRECT_MAPPED_CACHE		opt_cpu.h
-CPU_DISABLE_5X86_LSSER		opt_cpu.h
-CPU_FASTER_5X86_FPU		opt_cpu.h
-CPU_I486_ON_386			opt_cpu.h
-CPU_IORT			opt_cpu.h
-CPU_LOOP_EN			opt_cpu.h
-CPU_RSTK_EN			opt_cpu.h
-CPU_SUSP_HLT			opt_cpu.h
-CPU_UPGRADE_HW_CACHE		opt_cpu.h
-CPU_WT_ALLOC			opt_cpu.h
-CYRIX_CACHE_WORKS		opt_cpu.h
-CYRIX_CACHE_REALLY_WORKS	opt_cpu.h
-NO_MEMORY_HOLE			opt_cpu.h
-
-# The CPU type affects the endian conversion functions all over the kernel.
-I386_CPU		opt_global.h
-I486_CPU		opt_global.h
-I586_CPU		opt_global.h
-I686_CPU		opt_global.h
-
-MAXCONS			opt_syscons.h
-SC_ALT_MOUSE_IMAGE	opt_syscons.h
-SC_DEBUG_LEVEL		opt_syscons.h
-SC_DFLT_FONT		opt_syscons.h
-SC_DISABLE_DDBKEY	opt_syscons.h
-SC_DISABLE_REBOOT	opt_syscons.h
-SC_HISTORY_SIZE		opt_syscons.h
-SC_KERNEL_CONS_ATTR	opt_syscons.h
-SC_KERNEL_CONS_REV_ATTR	opt_syscons.h
-SC_MOUSE_CHAR		opt_syscons.h
-SC_NO_CUTPASTE		opt_syscons.h
-SC_NO_FONT_LOADING	opt_syscons.h
-SC_NO_HISTORY		opt_syscons.h
-SC_NO_SYSMOUSE		opt_syscons.h
-SC_NORM_ATTR		opt_syscons.h
-SC_NORM_REV_ATTR	opt_syscons.h
-SC_PIXEL_MODE		opt_syscons.h
-SC_RENDER_DEBUG		opt_syscons.h
-SC_TWOBUTTON_MOUSE	opt_syscons.h
-
-GDC			opt_gdc.h
-
-PSM_HOOKRESUME		opt_psm.h
-PSM_RESETAFTERSUSPEND	opt_psm.h
-PSM_DEBUG		opt_psm.h
-
-PCIC_RESUME_RESET	opt_pcic.h
-
-KBD_DISABLE_KEYMAP_LOAD	opt_kbd.h
-KBD_INSTALL_CDEV	opt_kbd.h
-KBD_MAXRETRY		opt_kbd.h
-KBD_MAXWAIT		opt_kbd.h
-KBD_RESETDELAY		opt_kbd.h
-KBDIO_DEBUG		opt_kbd.h
-
-USERCONFIG		opt_userconfig.h
-VISUAL_USERCONFIG	opt_userconfig.h
-INTRO_USERCONFIG	opt_userconfig.h
-
-EISA_SLOTS		opt_eisa.h
-
-FE_8BIT_SUPPORT		opt_fe.h
-
-# pcvt(4) has a bunch of options
-FAT_CURSOR		opt_pcvt.h
-XSERVER			opt_pcvt.h
-PCVT_24LINESDEF		opt_pcvt.h
-PCVT_CTRL_ALT_DEL	opt_pcvt.h
-PCVT_EMU_MOUSE		opt_pcvt.h
-PCVT_FREEBSD		opt_pcvt.h
-PCVT_META_ESC		opt_pcvt.h
-PCVT_NSCREENS		opt_pcvt.h
-PCVT_PRETTYSCRNS	opt_pcvt.h
-PCVT_SCANSET		opt_pcvt.h
-PCVT_SCREENSAVER	opt_pcvt.h
-PCVT_USEKBDSEC		opt_pcvt.h
-PCVT_VT220KEYB		opt_pcvt.h
-
-# voxware options
-GUS_DMA2		opt_sound.h
-GUS_DMA			opt_sound.h
-GUS_IRQ			opt_sound.h
-
-# Video spigot
-SPIGOT_UNSECURE		opt_spigot.h
-
-# -------------------------------
-# isdn4bsd: passive ISA cards
-# -------------------------------
-TEL_S0_8		opt_i4b.h
-TEL_S0_16		opt_i4b.h
-TEL_S0_16_3		opt_i4b.h
-AVM_A1			opt_i4b.h
-USR_STI			opt_i4b.h
-#ITKIX1			opt_i4b.h
-ELSA_PCC16		opt_i4b.h
-# -------------------------------
-# isdn4bsd: passive ISA PnP cards
-# -------------------------------
-CRTX_S0_P		opt_i4b.h
-DRN_NGO                 opt_i4b.h
-TEL_S0_16_3_P		opt_i4b.h
-SEDLBAUER		opt_i4b.h
-#DYNALINK		opt_i4b.h
-ASUSCOM_IPAC		opt_i4b.h
-ELSA_QS1ISA		opt_i4b.h
-#AVM_PNP		opt_i4b.h
-SIEMENS_ISURF2		opt_i4b.h
-# -------------------------------
-# isdn4bsd: passive PCI cards
-# -------------------------------
-ELSA_QS1PCI		opt_i4b.h
-AVM_A1_PCI		opt_i4b.h
-# -------------------------------
-# isdn4bsd: passive PCMCIA cards
-# -------------------------------
-#AVM_A1_PCMCIA		opt_i4b.h
-# -------------------------------
-# isdn4bsd: misc options
-# -------------------------------
-# temporary workaround for SMP machines
-I4B_SMP_WORKAROUND      opt_i4b.h
-# enable VJ compression code for ipr i/f
-IPR_VJ			opt_i4b.h
-IPR_LOG			opt_i4b.h
-
-# -------------------------------
-# oltr: build options
-# -------------------------------
-# Exclude microcode options
-OLTR_NO_TMS_MAC		opt_oltr.h
-OLTR_NO_HAWKEYE_MAC	opt_oltr.h
-OLTR_NO_BULLSEYE_MAC	opt_oltr.h
-
-# Total number of ports controlled by the dgb(4) driver.
-# Defaults to NDGB*16.
-NDGBPORTS		opt_dgb.h
-
-# Temporary options for moving to pnpbios
-PNPBIOS			opt_pnp.h
-
-# -------------------------------
-# EOF
-# -------------------------------
-
-# bs driver options
-SCSI_BOUNCE_SIZE	opt_bs.h
-BS_TARG_SAFEMODE	opt_bs.h
-
-# npx options
-FPU_ERROR_BROKEN	opt_npx.h
-
-# PC98 options
-PC98			opt_global.h
-EPSON_BOUNCEDMA		opt_pc98.h
-EPSON_MEMWIN		opt_pc98.h
-LINE30			opt_syscons.h