1 files changed, 62 insertions, 115 deletions

diff --git a/sys/conf/files.mips b/sys/conf/files.mips
index ff44986c93bcc..86874693e5cd4 100644
--- a/sys/conf/files.mips
+++ b/sys/conf/files.mips
@@ -1,130 +1,77 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# Copyright (c) 2001, 2004-2005, Juniper Networks, Inc.
-# All rights reserved.
-# JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta
-#
-# ----------------------------------------------------------------------
-# Phase 2
-# ----------------------------------------------------------------------
-# This file tells config what files go into building a kernel,
-# files marked standard are always included.
-#
-# Copyright (c) 2001, 2004-2005, Juniper Networks, Inc.
-# All rights reserved.
-# JNPR: files.mips,v 1.11 2007/08/09 12:25:35 katta
 # $FreeBSD$
 #
-# ----------------------------------------------------------------------
-# Phase 2
-# ----------------------------------------------------------------------
-mips/mips/machdep.c		standard
-mips/mips/mp_machdep.c		optional smp
-mips/mips/mpboot.S		optional smp
-# ----------------------------------------------------------------------
-# Phase 3
-# ----------------------------------------------------------------------
-mips/mips/autoconf.c		standard
-mips/mips/cpu.c			standard
-mips/mips/elf_machdep.c		standard
-mips/mips/exception.S		standard
-mips/mips/gdb_machdep.c		standard
-mips/mips/pmap.c		standard
-mips/mips/trap.c		standard
-mips/mips/vm_machdep.c		standard
-# ----------------------------------------------------------------------
-# Phase 4
-# ----------------------------------------------------------------------
-# ----------------------------------------------------------------------
-# Phase 5
-# ----------------------------------------------------------------------
-mips/mips/fp.S			standard
-mips/mips/pm_machdep.c		standard
-mips/mips/swtch.S		standard
-mips/mips/tlb.c			standard
 
-mips/mips/bus_space_generic.c 	standard
-mips/mips/busdma_machdep.c 	standard
-mips/mips/cache.c		standard
-mips/mips/cache_mipsNN.c	standard
-mips/mips/db_disasm.c		optional	ddb
-mips/mips/db_interface.c	optional	ddb
-mips/mips/db_trace.c		optional	ddb
-mips/mips/dump_machdep.c	standard
-mips/mips/in_cksum.c		optional	inet | inet6
-mips/mips/locore.S		standard	no-obj
-mips/mips/minidump_machdep.c	standard
-mips/mips/mem.c			optional	mem
-mips/mips/libkern_machdep.c	standard
-mips/mips/nexus.c		standard
-mips/mips/stack_machdep.c	optional	ddb | stack
-mips/mips/support.S		standard
-mips/mips/sys_machdep.c		standard
-mips/mips/swtch.S		standard
-mips/mips/uio_machdep.c		standard
-mips/mips/uma_machdep.c		standard
-crypto/blowfish/bf_enc.c	optional	crypto | ipsec 
-crypto/des/des_enc.c		optional	crypto | ipsec
-geom/geom_bsd.c			optional	geom_bsd
-geom/geom_bsd_enc.c		optional	geom_bsd
-geom/geom_mbr.c			optional	geom_mbr
-geom/geom_mbr_enc.c		optional	geom_mbr
-libkern/ashldi3.c		standard
-libkern/ashrdi3.c		standard
-libkern/cmpdi2.c		standard
-libkern/ffsl.c			standard
-libkern/fls.c			standard
-libkern/flsl.c			standard
-libkern/lshrdi3.c		standard
-libkern/memchr.c		optional	fdt
-libkern/memmove.c		standard
-libkern/ucmpdi2.c		standard
+# Arch dependent files
+mips/mips/autoconf.c			standard
+mips/mips/bus_space_generic.c		standard
+mips/mips/busdma_machdep.c		standard
+mips/mips/cache.c			standard
+mips/mips/cache_mipsNN.c		standard
+mips/mips/cpu.c				standard
+mips/mips/db_disasm.c			optional	ddb
+mips/mips/db_interface.c		optional	ddb
+mips/mips/db_trace.c			optional	ddb
+mips/mips/dump_machdep.c		standard
+mips/mips/elf_machdep.c			standard
+mips/mips/exception.S			standard
+mips/mips/fp.S				standard
+mips/mips/gdb_machdep.c			standard
+mips/mips/in_cksum.c			optional	inet
+mips/mips/intr_machdep.c		standard
+mips/mips/libkern_machdep.c		standard
+mips/mips/locore.S			standard	no-obj
+mips/mips/machdep.c			standard
+mips/mips/mem.c				optional	mem
+mips/mips/minidump_machdep.c		standard
+mips/mips/mp_machdep.c			optional	smp
+mips/mips/mpboot.S			optional	smp
+mips/mips/nexus.c			standard
+mips/mips/pm_machdep.c			standard
+mips/mips/pmap.c			standard
+mips/mips/ptrace_machdep.c		standard
+mips/mips/sc_machdep.c			standard
+mips/mips/stack_machdep.c		standard
+mips/mips/support.S			standard
+mips/mips/swtch.S			standard
+mips/mips/sys_machdep.c			standard
+mips/mips/tick.c			standard
+mips/mips/tlb.c				standard
+mips/mips/trap.c			standard
+mips/mips/uio_machdep.c			standard
+mips/mips/uma_machdep.c			standard
+mips/mips/vm_machdep.c			standard
 
-#XXX: We can't use these versions, as strcmp.c is included conf/files
-#libkern/mips/strcmp.S		standard
-#libkern/mips/strncmp.S		standard
+# misc opt-in bits
+kern/kern_clocksource.c			standard
+kern/link_elf_obj.c			standard
+kern/subr_dummy_vdso_tc.c		standard
+
+# Common geom we need to support: MBR and BSD
+geom/geom_bsd.c				standard
+geom/geom_bsd_enc.c			standard
+geom/geom_mbr.c				standard
+geom/geom_mbr_enc.c			standard
 
-cddl/compat/opensolaris/kern/opensolaris_atomic.c	optional zfs compile-with "${ZFS_C}"
+# gcc/clang runtime
+libkern/ashldi3.c			standard
+libkern/ashrdi3.c			standard
+libkern/ffsl.c				standard
+libkern/fls.c				standard
+libkern/flsl.c				standard
+libkern/lshrdi3.c			standard
+libkern/memmove.c			standard
+
+# Compat32 stuff
 compat/freebsd32/freebsd32_ioctl.c	optional	compat_freebsd32
 compat/freebsd32/freebsd32_misc.c	optional	compat_freebsd32
 compat/freebsd32/freebsd32_syscalls.c	optional	compat_freebsd32
 compat/freebsd32/freebsd32_sysent.c	optional	compat_freebsd32
 kern/imgact_elf32.c			optional	compat_freebsd32
-kern/subr_dummy_vdso_tc.c		standard
 mips/mips/freebsd32_machdep.c		optional	compat_freebsd32
 
-kern/kern_clocksource.c		standard
-kern/link_elf_obj.c		standard
-
-dev/cfe/cfe_api.c		optional	cfe
-dev/cfe/cfe_console.c		optional	cfe_console
-dev/cfe/cfe_env.c		optional	cfe_env
-#dev/cfe/cfe_resource.c		optional	cfe	# not yet needed
-
-dev/siba/siba.c			optional	siba
-dev/siba/siba_cc.c		optional	siba
-dev/siba/siba_core.c		optional	siba
-dev/siba/siba_pcib.c		optional	siba pci
-#mips/sentry5/siba_mips.c			optional siba # not yet
-
-dev/hwpmc/hwpmc_mips.c		optional hwpmc
-
-dev/rt/if_rt.c			optional 	rt
-dev/nvram2env/nvram2env.c	optional	nvram2env
-
-dev/ofw/openfirm.c		optional	fdt
-dev/ofw/openfirmio.c		optional	fdt
-dev/ofw/ofw_bus_if.m		optional	fdt
-dev/ofw/ofw_if.m		optional	fdt
-dev/ofw/ofw_bus_subr.c		optional	fdt
-dev/ofw/ofw_fdt.c		optional	fdt
-
-dev/fdt/fdt_mips.c		optional	fdt
-
-dev/fb/fb.c			optional	sc
-dev/kbd/kbd.c			optional	sc
-dev/syscons/scgfbrndr.c		optional	sc
-dev/syscons/scterm-teken.c	optional	sc
-dev/syscons/scvtb.c		optional	sc
-mips/mips/sc_machdep.c		optional	sc
+dev/cfe/cfe_api.c			optional	cfe
+dev/cfe/cfe_console.c			optional	cfe_console
+dev/cfe/cfe_env.c			optional	cfe_env