[Midnightbsd-cvs] src: sys/conf:
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Sep 21 11:25:04 EDT 2008
Log Message:
-----------
Modified Files:
--------------
src/sys/conf:
Makefile.amd64 (r1.1.1.1 -> r1.2)
Makefile.i386 (r1.2 -> r1.3)
Makefile.sparc64 (r1.1.1.1 -> r1.2)
NOTES (r1.2 -> r1.3)
files (r1.11 -> r1.12)
files.amd64 (r1.1.1.2 -> r1.2)
files.i386 (r1.2 -> r1.3)
files.sparc64 (r1.1.1.2 -> r1.2)
kern.mk (r1.1.1.1 -> r1.2)
kern.post.mk (r1.1.1.1 -> r1.2)
kern.pre.mk (r1.1.1.1 -> r1.2)
kmod.mk (r1.1.1.2 -> r1.2)
options (r1.6 -> r1.7)
options.amd64 (r1.1.1.1 -> r1.2)
options.i386 (r1.1.1.1 -> r1.2)
options.sparc64 (r1.1.1.1 -> r1.2)
systags.sh (r1.1.1.1 -> r1.2)
Added Files:
-----------
src/sys/conf:
Makefile.sun4v (r1.1)
files.sun4v (r1.1)
options.sun4v (r1.1)
Removed Files:
-------------
src/sys/conf:
Makefile.arm
Makefile.ia64
files.arm
files.ia64
ldscript.arm
ldscript.ia64
options.arm
options.ia64
-------------- next part --------------
--- sys/conf/options.ia64
+++ /dev/null
@@ -1,34 +0,0 @@
-# $FreeBSD: src/sys/conf/options.ia64,v 1.26 2004/08/16 18:54:22 marcel Exp $
-# Options specific to the ia64 platform kernels
-
-ITANIUM opt_global.h
-ITANIUM2 opt_global.h
-
-LOG2_ID_PAGE_SIZE opt_global.h
-LOG2_PAGE_SIZE opt_global.h
-
-UWX_TRACE_ENABLE opt_global.h
-
-COMPAT_IA32 opt_compat.h
-
-PPC_PROBE_CHIPSET opt_ppc.h
-PPC_DEBUG opt_ppc.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
-
-# SKI emulator options
-SKI opt_ski.h
-SKI_ROOT_FILESYSTEM opt_ski.h
-SSC_NSECT opt_ski.h
--- /dev/null
+++ sys/conf/options.sun4v
@@ -0,0 +1,15 @@
+# $FreeBSD: src/sys/conf/options.sun4v,v 1.2 2007/01/19 12:22:50 marius Exp $
+
+SUN4V opt_global.h
+
+OFW_PCI_DEBUG opt_ofw_pci.h
+OFWCONS_POLL_HZ opt_ofw.h
+# Debug IOMMU inserts/removes using diagnostic accesses. Very loud.
+IOMMU_DIAG opt_iommu.h
+PMAP_STATS opt_pmap.h
+SIMULATOR opt_simulator.h
+
+DTRACE opt_global.h
+
+TRAP_TRACING opt_trap_trace.h
+TRAP_TRACE_ENTRIES opt_trap_trace.h
--- sys/conf/options.arm
+++ /dev/null
@@ -1,15 +0,0 @@
-#$FreeBSD: src/sys/conf/options.arm,v 1.5 2005/06/07 23:05:04 cognet Exp $
-ARM32_NEW_VM_LAYOUT opt_vm.h
-ARM9_CACHE_WRITE_THROUGH opt_global.h
-ARM_CACHE_LOCK_ENABLE opt_global.h
-ARMFPE opt_global.h
-ARM_USE_SMALL_ALLOC opt_global.h
-CPU_SA1100 opt_global.h
-CPU_SA1110 opt_global.h
-CPU_ARM9 opt_global.h
-CPU_XSCALE_80321 opt_global.h
-PHYSADDR opt_global.h
-KERNPHYSADDR opt_global.h
-KERNVIRTADDR opt_global.h
-STARTUP_PAGETABLE_ADDR opt_global.h
-XSCALE_CACHE_READ_WRITE_ALLOCATE opt_global.h
Index: options
===================================================================
RCS file: /home/cvs/src/sys/conf/options,v
retrieving revision 1.6
retrieving revision 1.7
diff -L sys/conf/options -L sys/conf/options -u -r1.6 -r1.7
--- sys/conf/options
+++ sys/conf/options
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.510.2.3 2005/10/07 14:00:03 glebius Exp $
+# $FreeBSD: src/sys/conf/options,v 1.608 2007/09/23 07:34:23 pjd Exp $
#
# On the handling of kernel options
#
@@ -16,7 +16,7 @@
# <xxx>.[c|s] should be directed into "opt_<xxx>.h", while options
# that affect multiple files should either go in "opt_global.h" if
# this is a kernel-wide option (used just about everywhere), or in
-# "opt_<option-name-in-lower-case>.h" if it affect only some files.
+# "opt_<option-name-in-lower-case>.h" if it affects only some files.
# Note that the effect of listing only an option without a
# header-file-name in conf/options (and cousins) is that the last
# convention is followed.
@@ -50,48 +50,56 @@
DDB
DDB_NUMSYM opt_ddb.h
GDB
-GDBSPEED opt_gdb.h
KDB opt_global.h
KDB_TRACE opt_kdb.h
KDB_UNATTENDED opt_kdb.h
SYSCTL_DEBUG opt_sysctl.h
+NO_SYSCTL_DESCR opt_global.h
+
# Miscellaneous options.
ADAPTIVE_GIANT opt_adaptive_mutexes.h
-NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h
+ADAPTIVE_SX
ALQ
+AUDIT opt_global.h
CODA_COMPAT_5 opt_coda.h
COMPAT_43 opt_compat.h
+COMPAT_43TTY opt_compat.h
COMPAT_FREEBSD4 opt_compat.h
COMPAT_FREEBSD5 opt_compat.h
+COMPAT_FREEBSD6 opt_compat.h
COMPILING_LINT opt_global.h
-CONSPEED opt_comconsole.h
CY_PCI_FASTINTR
-DIRECTIO opt_directio.h
+DIRECTIO
FULL_PREEMPTION opt_sched.h
-PREEMPTION opt_sched.h
IPI_PREEMPTION opt_sched.h
GEOM_AES opt_geom.h
-GEOM_APPLE opt_geom.h
GEOM_BDE opt_geom.h
GEOM_BSD opt_geom.h
+GEOM_CACHE opt_geom.h
GEOM_CONCAT opt_geom.h
GEOM_ELI opt_geom.h
GEOM_FOX opt_geom.h
GEOM_GATE opt_geom.h
-GEOM_GPT opt_geom.h
+GEOM_JOURNAL opt_geom.h
GEOM_LABEL opt_geom.h
GEOM_MBR opt_geom.h
GEOM_MIRROR opt_geom.h
+GEOM_MULTIPATH opt_geom.h
GEOM_NOP opt_geom.h
+GEOM_PART_APM opt_geom.h
+GEOM_PART_GPT opt_geom.h
+GEOM_PART_MBR opt_geom.h
GEOM_PC98 opt_geom.h
GEOM_RAID3 opt_geom.h
GEOM_SHSEC opt_geom.h
GEOM_STRIPE opt_geom.h
GEOM_SUNLABEL opt_geom.h
GEOM_UZIP opt_geom.h
+GEOM_VIRSTOR opt_geom.h
GEOM_VOL opt_geom.h
GEOM_ZERO opt_geom.h
+KSE opt_global.h
KSTACK_MAX_PAGES
KSTACK_PAGES
KTRACE
@@ -101,7 +109,6 @@
MAC_ALWAYS_LABEL_MBUF opt_mac.h
MAC_BIBA opt_dontuse.h
MAC_BSDEXTENDED opt_dontuse.h
-MAC_DEBUG opt_mac.h
MAC_IFOFF opt_dontuse.h
MAC_LOMAC opt_dontuse.h
MAC_MLS opt_dontuse.h
@@ -115,20 +122,26 @@
MD_ROOT opt_md.h
MD_ROOT_SIZE opt_md.h
MFI_DEBUG opt_mfi.h
+MFI_DECODE_LOG opt_mfi.h
MPROF_BUFFERS opt_mprof.h
MPROF_HASH_SIZE opt_mprof.h
-MUTEX_WAKE_ALL
+NO_ADAPTIVE_MUTEXES opt_adaptive_mutexes.h
+NO_ADAPTIVE_RWLOCKS
NSWBUF_MIN opt_swap.h
+MBUF_PACKET_ZONE_DISABLE opt_global.h
PANIC_REBOOT_WAIT_TIME opt_panic.h
+PPC_DEBUG opt_ppc.h
+PPC_PROBE_CHIPSET opt_ppc.h
PPS_SYNC opt_ntp.h
-PUC_FASTINTR opt_puc.h
+PREEMPTION opt_sched.h
QUOTA
SCHED_4BSD opt_sched.h
SCHED_ULE opt_sched.h
SHOW_BUSYBUFS
SLEEPQUEUE_PROFILING
+SLHCI_DEBUG opt_slhci.h
SPX_HACK
-SUIDDIR opt_suiddir.h
+SUIDDIR
MSGMNB opt_sysvipc.h
MSGMNI opt_sysvipc.h
MSGSEG opt_sysvipc.h
@@ -154,10 +167,12 @@
TURNSTILE_PROFILING
TTYHOG opt_tty.h
VFS_AIO
+VERBOSE_SYSINIT opt_global.h
WLCACHE opt_wavelan.h
WLDEBUG opt_wavelan.h
# POSIX kernel options
+P1003_1B_MQUEUE opt_posix.h
P1003_1B_SEMAPHORES opt_posix.h
_KPOSIX_PRIORITY_SCHEDULING opt_posix.h
@@ -172,7 +187,7 @@
CODA opt_dontuse.h
EXT2FS opt_dontuse.h
FDESCFS opt_dontuse.h
-LINPROCFS opt_dontuse.h
+HPFS opt_dontuse.h
MSDOSFS opt_dontuse.h
NTFS opt_dontuse.h
NULLFS opt_dontuse.h
@@ -182,8 +197,8 @@
PSEUDOFS opt_dontuse.h
REISERFS opt_dontuse.h
SMBFS opt_dontuse.h
+TMPFS opt_dontuse.h
UDF opt_dontuse.h
-UMAPFS opt_dontuse.h
UNIONFS opt_dontuse.h
# Pseudofs debugging
@@ -198,6 +213,7 @@
# filesystems will be enabled - but look below.
NFSCLIENT opt_nfs.h
NFSSERVER opt_nfs.h
+NFS4CLIENT opt_nfs.h
# filesystems and libiconv bridge
CD9660_ICONV opt_dontuse.h
@@ -211,6 +227,11 @@
# otherwise a STUB module will be compiled in.
SOFTUPDATES opt_ffs.h
+# On small, embedded systems, it can be useful to turn off support for
+# snapshots. It saves about 30-40k for a feature that would be lightly
+# used, if it is used at all.
+NO_FFS_SNAPSHOT opt_ffs.h
+
# Enabling this option turns on support for Access Control Lists in UFS,
# which can be used to support high security configurations. Depends on
# UFS_EXTATTR.
@@ -225,6 +246,9 @@
# Enable fast hash lookups for large directories on UFS-based filesystems.
UFS_DIRHASH opt_ufs.h
+# Enable gjournal-based UFS journal.
+UFS_GJOURNAL opt_ufs.h
+
# The below sentence is not in English, and neither is this one.
# We plan to remove the static dependences above, with a
# <filesystem>_ROOT option to control if it usable as root. This list
@@ -233,17 +257,12 @@
NFS_ROOT opt_nfsroot.h
# SMB/CIFS requester
-NETSMB opt_netsmb.h
-NETSMBCRYPTO opt_netsmb.h
-
-# Experimental support for large MS-DOS filesystems; SEE WARNING IN "NOTES"!
-MSDOSFS_LARGE opt_msdosfs.h
+NETSMB opt_netsmb.h
# Options used only in subr_param.c.
HZ opt_param.h
MAXFILES opt_param.h
NBUF opt_param.h
-NMBCLUSTERS opt_param.h
NSFBUFS opt_param.h
VM_BCACHE_SIZE_MAX opt_param.h
VM_SWZONE_SIZE_MAX opt_param.h
@@ -260,7 +279,6 @@
CAM_DEBUG_TARGET opt_cam.h
CAM_DEBUG_LUN opt_cam.h
CAM_DEBUG_FLAGS opt_cam.h
-CAM_NEW_TRAN_CODE opt_cam.h
SCSI_DELAY opt_scsi.h
SCSI_NO_SENSE_STRINGS opt_scsi.h
SCSI_NO_OP_STRINGS opt_scsi.h
@@ -304,6 +322,10 @@
# Options used only in dev/isp/*
ISP_TARGET_MODE opt_isp.h
ISP_FW_CRASH_DUMP opt_isp.h
+ISP_DEFAULT_ROLES opt_isp.h
+
+# Options used only in dev/iscsi
+ISCSI_INITIATOR_DEBUG opt_iscsi_initiator.h
# Options used in the 'ata' ATA/ATAPI driver
ATA_STATIC_ID opt_ata.h
@@ -326,8 +348,8 @@
BOOTP_NFSROOT opt_bootp.h
BOOTP_NFSV3 opt_bootp.h
BOOTP_WIRED_TO opt_bootp.h
-BRIDGE opt_bdg.h
DEVICE_POLLING
+DEV_ENC opt_enc.h
DEV_PF opt_pf.h
DEV_PFLOG opt_pf.h
DEV_PFSYNC opt_pf.h
@@ -336,14 +358,11 @@
ETHER_8022 opt_ef.h
ETHER_SNAP opt_ef.h
MROUTING opt_mrouting.h
-PIM opt_mrouting.h
INET opt_inet.h
INET6 opt_inet6.h
IPSEC opt_ipsec.h
-IPSEC_ESP opt_ipsec.h
IPSEC_DEBUG opt_ipsec.h
-IPSEC_FILTERGIF opt_ipsec.h
-FAST_IPSEC opt_ipsec.h
+IPSEC_FILTERTUNNEL opt_ipsec.h
IPDIVERT
DUMMYNET opt_ipdn.h
IPFILTER opt_ipfilter.h
@@ -355,31 +374,41 @@
IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h
IPFIREWALL_DEFAULT_TO_ACCEPT opt_ipfw.h
IPFIREWALL_FORWARD opt_ipfw.h
-IPFIREWALL_FORWARD_EXTENDED opt_ipfw.h
-IPV6FIREWALL opt_ip6fw.h
-IPV6FIREWALL_VERBOSE opt_ip6fw.h
-IPV6FIREWALL_VERBOSE_LIMIT opt_ip6fw.h
-IPV6FIREWALL_DEFAULT_TO_ACCEPT opt_ip6fw.h
+IPFIREWALL_NAT opt_ipfw.h
IPSTEALTH
IPX
-IPXIP opt_ipx.h
LIBMBPOOL
LIBMCHAIN
LIBALIAS
-MBUF_STRESS_TEST opt_mbuf_stress_test.h
+MBUF_STRESS_TEST
NCP
NETATALK opt_atalk.h
-NET_WITH_GIANT opt_net.h
PPP_BSDCOMP opt_ppp.h
PPP_DEFLATE opt_ppp.h
PPP_FILTER opt_ppp.h
SLIP_IFF_OPTS opt_slip.h
TCPDEBUG
TCP_SIGNATURE opt_inet.h
-TCP_SACK_DEBUG opt_tcp_sack.h
-TCP_DROP_SYNFIN opt_tcp_input.h
+DEV_VLAN opt_vlan.h
+VLAN_ARRAY opt_vlan.h
XBONEHACK
+#
+# SCTP
+#
+SCTP opt_sctp.h
+SCTP_DEBUG opt_sctp.h # Enable debug printfs
+SCTP_WITH_NO_CSUM opt_sctp.h # Use this at your peril
+SCTP_LOCK_LOGGING opt_sctp.h # Log to KTR lock activity
+SCTP_MBUF_LOGGING opt_sctp.h # Log to KTR general mbuf aloc/free
+SCTP_MBCNT_LOGGING opt_sctp.h # Log to KTR mbcnt activity
+SCTP_PACKET_LOGGING opt_sctp.h # Log to a packet buffer last N packets
+SCTP_LTRACE_CHUNKS opt_sctp.h # Log to KTR chunks processed
+SCTP_LTRACE_ERRORS opt_sctp.h # Log to KTR error returns.
+#
+#
+#
+
# Netgraph(4). Use option NETGRAPH to enable the base netgraph code.
# Each netgraph node type can be either be compiled into the kernel
# or loaded dynamically. To get the former, include the corresponding
@@ -399,7 +428,9 @@
NETGRAPH_BLUETOOTH_UBTBCMFW opt_netgraph.h
NETGRAPH_BPF opt_netgraph.h
NETGRAPH_BRIDGE opt_netgraph.h
+NETGRAPH_CAR opt_netgraph.h
NETGRAPH_CISCO opt_netgraph.h
+NETGRAPH_DEFLATE opt_netgraph.h
NETGRAPH_DEVICE opt_netgraph.h
NETGRAPH_ECHO opt_netgraph.h
NETGRAPH_EIFACE opt_netgraph.h
@@ -424,10 +455,12 @@
NETGRAPH_PPP opt_netgraph.h
NETGRAPH_PPPOE opt_netgraph.h
NETGRAPH_PPTPGRE opt_netgraph.h
+NETGRAPH_PRED1 opt_netgraph.h
NETGRAPH_RFC1490 opt_netgraph.h
NETGRAPH_SOCKET opt_netgraph.h
NETGRAPH_SPLIT opt_netgraph.h
NETGRAPH_SPPP opt_netgraph.h
+NETGRAPH_TAG opt_netgraph.h
NETGRAPH_TCPMSS opt_netgraph.h
NETGRAPH_TEE opt_netgraph.h
NETGRAPH_TTY opt_netgraph.h
@@ -449,12 +482,12 @@
TI_PRIVATE_JUMBOS opt_ti.h
TI_JUMBO_HDRSPLIT opt_ti.h
-# ATM (HARP version)
-ATM_CORE opt_atm.h
-ATM_IP opt_atm.h
-ATM_SIGPVC opt_atm.h
-ATM_SPANS opt_atm.h
-ATM_UNI opt_atm.h
+# ATM (HARP version) - disabled as not MPSAFE in 7.0
+#ATM_CORE opt_atm.h
+#ATM_IP opt_atm.h
+#ATM_SIGPVC opt_atm.h
+#ATM_SPANS opt_atm.h
+#ATM_UNI opt_atm.h
# XXX Conflict: # of devices vs network protocol (Native ATM).
# This makes "atm.h" unusable.
@@ -478,7 +511,6 @@
LOCKF_DEBUG opt_debug_lockf.h
NETATALKDEBUG opt_atalk.h
SI_DEBUG opt_debug_si.h
-SX_DEBUG opt_debug_sx.h
# Fb options
FB_DEBUG opt_fb.h
@@ -493,6 +525,8 @@
# These cause changes all over the kernel
BLKDEV_IOSIZE opt_global.h
+MAXPHYS opt_global.h
+DFLTPHYS opt_global.h
BURN_BRIDGES opt_global.h
DEBUG opt_global.h
DEBUG_LOCKS opt_global.h
@@ -503,10 +537,14 @@
MCLSHIFT opt_global.h
MUTEX_DEBUG opt_global.h
MUTEX_NOINLINE opt_global.h
-MUTEX_PROFILING opt_global.h
+LOCK_PROFILING opt_global.h
+LOCK_PROFILING_FAST opt_global.h
+LOCK_PROFILING_SHARED opt_global.h
MSIZE opt_global.h
REGRESSION opt_global.h
RESTARTABLE_PANICS opt_global.h
+RWLOCK_NOINLINE opt_global.h
+SX_NOINLINE opt_global.h
VFS_BIO_DEBUG opt_global.h
# These are VM related options
@@ -516,16 +554,13 @@
NO_SWAPPING opt_vm.h
MALLOC_MAKE_FAILURES opt_vm.h
MALLOC_PROFILE opt_vm.h
-PQ_NOOPT opt_vmpage.h
-PQ_NORMALCACHE opt_vmpage.h
-PQ_MEDIUMCACHE opt_vmpage.h
-PQ_LARGECACHE opt_vmpage.h
-PQ_HUGECACHE opt_vmpage.h
-PQ_CACHESIZE opt_vmpage.h
# The MemGuard replacement allocator used for tamper-after-free detection
DEBUG_MEMGUARD opt_vm.h
+# The RedZone malloc(9) protection
+DEBUG_REDZONE opt_vm.h
+
# Standard SMP options
SMP opt_global.h
@@ -562,9 +597,6 @@
BKTR_USE_FREEBSD_SMBUS opt_bktr.h
BKTR_NEW_MSP34XX_DRIVER opt_bktr.h
-# options for serial support
-COM_ESP opt_sio.h
-COM_MULTIPORT opt_sio.h
BREAK_TO_DEBUGGER opt_comconsole.h
ALT_BREAK_TO_DEBUGGER opt_comconsole.h
@@ -583,14 +615,13 @@
UVSCOM_INTR_INTERVAL opt_uvscom.h
# Embedded system options
-INIT_PATH opt_init_path.h
+INIT_PATH
-ROOTDEVNAME opt_rootdevname.h
+ROOTDEVNAME
FDC_DEBUG opt_fdc.h
PCFCLOCK_VERBOSE opt_pcfclock.h
PCFCLOCK_MAX_RETRIES opt_pcfclock.h
-TDFX_LINUX opt_dontuse.h
KTR opt_global.h
KTR_ALQ opt_ktr.h
@@ -607,23 +638,22 @@
ACPI_DEBUG opt_acpi.h
ACPI_MAX_THREADS opt_acpi.h
ACPI_NO_SEMAPHORES opt_acpi.h
-ACPICA_PEDANTIC opt_acpi.h
-# options for DEVFS, see sys/fs/devfs/devfs.h
-NDEVFSINO opt_devfs.h
-NDEVFSOVERFLOW opt_devfs.h
+# ISA support
+DEV_ISA opt_isa.h
+ISAPNP opt_isa.h
# various 'device presence' options.
DEV_BPF opt_bpf.h
-DEV_ISA opt_isa.h
DEV_MCA opt_mca.h
DEV_CARP opt_carp.h
DEV_SPLASH opt_splash.h
+# EISA support
+DEV_EISA opt_eisa.h
EISA_SLOTS opt_eisa.h
# ed driver
-ED_NO_MIIBUS opt_ed.h
ED_HPP opt_ed.h
ED_3C503 opt_ed.h
ED_SIC opt_ed.h
@@ -631,9 +661,6 @@
# bce driver
BCE_DEBUG opt_bce.h
-# bge driver
-BGE_FAKE_AUTONEG opt_bge.h
-
# wi driver
WI_SYMBOL_FIRMWARE opt_wi.h
@@ -669,6 +696,7 @@
SC_NO_CUTPASTE opt_syscons.h
SC_NO_FONT_LOADING opt_syscons.h
SC_NO_HISTORY opt_syscons.h
+SC_NO_MODE_CHANGE opt_syscons.h
SC_NO_SUSPEND_VTYSWITCH opt_syscons.h
SC_NO_SYSMOUSE opt_syscons.h
SC_NORM_ATTR opt_syscons.h
@@ -677,6 +705,9 @@
SC_RENDER_DEBUG opt_syscons.h
SC_TWOBUTTON_MOUSE opt_syscons.h
+# options for printf
+PRINTF_BUFR_SIZE opt_printf.h
+
# kbd options
KBD_DISABLE_KEYMAP_LOAD opt_kbd.h
KBD_INSTALL_CDEV opt_kbd.h
@@ -692,18 +723,6 @@
ATH_DIAGAPI opt_ath.h
ATH_TX99_DIAG opt_ath.h
-# options for the Atheros HAL (only useful with source code)
-AH_SUPPORT_AR5210 opt_ah.h
-AH_SUPPORT_AR5211 opt_ah.h
-AH_SUPPORT_AR5212 opt_ah.h
-AH_SUPPORT_5111 opt_ah.h
-AH_SUPPORT_5112 opt_ah.h
-AH_SUPPORT_2413 opt_ah.h
-AH_SUPPORT_5413 opt_ah.h
-AH_DEBUG opt_ah.h
-AH_DEBUG_ALQ opt_ah.h
-AH_ASSERT opt_ah.h
-
# dcons options
DCONS_BUF_SIZE opt_dcons.h
DCONS_POLL_HZ opt_dcons.h
@@ -714,12 +733,21 @@
NI4BTRC opt_i4b.h
NI4BRBCH opt_i4b.h
NI4BTEL opt_i4b.h
-NI4BIPR opt_i4b.h
-NI4BING opt_i4b.h
-NI4BISPPP opt_i4b.h
+#XXXBZ#NI4BIPR opt_i4b.h
+#XXXBZ#NI4BING opt_i4b.h
+#XXXBZ#NI4BISPPP opt_i4b.h
# VFS options
LOOKUP_SHARED opt_vfs.h
# HWPMC options
HWPMC_HOOKS
+
+# XBOX options for FreeBSD/i386, but some files are MI
+XBOX opt_xbox.h
+
+# XFS
+XFS
+
+# Interrupt filtering
+INTR_FILTER opt_global.h
Index: kern.mk
===================================================================
RCS file: /home/cvs/src/sys/conf/kern.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/conf/kern.mk -L sys/conf/kern.mk -u -r1.1.1.1 -r1.2
--- sys/conf/kern.mk
+++ sys/conf/kern.mk
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.mk,v 1.45 2005/03/31 22:53:58 peter Exp $
+# $FreeBSD: src/sys/conf/kern.mk,v 1.52 2007/05/24 21:53:42 obrien Exp $
#
# Warning flags for compiling the kernel and components of the kernel.
@@ -12,7 +12,13 @@
.else
CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \
-Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \
- -fformat-extensions -std=c99
+ ${_wundef} ${_Wno_pointer_sign} -fformat-extensions
+.if !defined(WITH_GCC3)
+_Wno_pointer_sign=-Wno-pointer-sign
+.endif
+.if !defined(NO_UNDEF)
+_wundef= -Wundef
+.endif
.endif
#
# The following flags are next up for working on:
@@ -31,20 +37,10 @@
#
.if ${MACHINE_ARCH} == "i386" && ${CC} != "icc"
CFLAGS+= -mno-align-long-strings -mpreferred-stack-boundary=2 \
- -mno-mmx -mno-3dnow -mno-sse -mno-sse2
+ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3
INLINE_LIMIT?= 8000
.endif
-#
-# On the alpha, make sure that we don't use floating-point registers and
-# allow the use of BWX etc instructions (only needed for low-level i/o).
-# Also, reserve register t7 to point at per-cpu global variables.
-#
-.if ${MACHINE_ARCH} == "alpha"
-CFLAGS+= -mno-fp-regs -ffixed-8 -Wa,-mev6
-INLINE_LIMIT?= 15000
-.endif
-
.if ${MACHINE_ARCH} == "arm"
INLINE_LIMIT?= 8000
.endif
@@ -53,7 +49,7 @@
# a very small subset of float registers for integer divides.
#
.if ${MACHINE_ARCH} == "ia64"
-CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -mno-sdata
+CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata
INLINE_LIMIT?= 15000
.endif
@@ -63,7 +59,7 @@
# operations which it has a tendency to do.
#
.if ${MACHINE_ARCH} == "sparc64"
-CFLAGS+= -mcmodel=medlow -msoft-float
+CFLAGS+= -mcmodel=medany -msoft-float
INLINE_LIMIT?= 15000
.endif
Index: files.i386
===================================================================
RCS file: /home/cvs/src/sys/conf/files.i386,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/conf/files.i386 -L sys/conf/files.i386 -u -r1.2 -r1.3
--- sys/conf/files.i386
+++ sys/conf/files.i386
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.538.2.5.2.1 2006/05/01 00:15:12 scottl Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.580.2.4.2.1 2008/02/06 03:24:28 scottl Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -57,7 +57,7 @@
no-implicit-rule
opt_ah.h optional ath_hal \
dependency "$S/contrib/dev/ath/public/i386-elf.opt_ah.h" \
- compile-with "cp $S/contrib/dev/ath/public/i386-elf.opt_ah.h opt_ah.h" \
+ compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/i386-elf.opt_ah.h opt_ah.h" \
no-obj no-implicit-rule before-depend \
clean "opt_ah.h"
#
@@ -72,18 +72,22 @@
no-implicit-rule no-obj before-depend \
clean "os+%DIKED-nve.h"
#
+hptrr_lib.o optional hptrr \
+ dependency "$S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
+ compile-with "uudecode < $S/dev/hptrr/i386-elf.hptrr_lib.o.uu" \
+ no-implicit-rule
+#
hptmvraid.o optional hptmv \
dependency "$S/dev/hptmv/i386-elf.raid.o.uu" \
compile-with "uudecode < $S/dev/hptmv/i386-elf.raid.o.uu" \
no-implicit-rule
#
-rr232x_lib.o optional rr232x \
- dependency "$S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \
- compile-with "uudecode < $S/dev/rr232x/i386-elf.rr232x_lib.o.uu" \
- no-implicit-rule
-#
#
+compat/linprocfs/linprocfs.c optional linprocfs
+compat/linsysfs/linsysfs.c optional linsysfs
+compat/linux/linux_emul.c optional compat_linux
compat/linux/linux_file.c optional compat_linux
+compat/linux/linux_futex.c optional compat_linux
compat/linux/linux_getcwd.c optional compat_linux
compat/linux/linux_ioctl.c optional compat_linux
compat/linux/linux_ipc.c optional compat_linux
@@ -93,6 +97,7 @@
compat/linux/linux_socket.c optional compat_linux
compat/linux/linux_stats.c optional compat_linux
compat/linux/linux_sysctl.c optional compat_linux
+compat/linux/linux_time.c optional compat_linux
compat/linux/linux_uid16.c optional compat_linux
compat/linux/linux_util.c optional compat_linux
compat/ndis/kern_ndis.c optional ndisapi pci
@@ -127,20 +132,14 @@
contrib/dev/oltr/trlldbm.c optional oltr
contrib/dev/oltr/trlldhm.c optional oltr
contrib/dev/oltr/trlldmac.c optional oltr
-bf_enc.o optional ipsec ipsec_esp \
- dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
- compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
- no-implicit-rule
-crypto/des/arch/i386/des_enc.S optional ipsec ipsec_esp
-crypto/des/arch/i386/des_enc.S optional netsmb
-bf_enc.o optional crypto \
- dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
- compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
+bf_enc.o optional crypto | ipsec \
+ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \
+ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \
no-implicit-rule
-crypto/des/arch/i386/des_enc.S optional crypto
-crypto/des/des_ecb.c optional crypto
-crypto/des/des_setkey.c optional crypto
+crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb
crypto/via/padlock.c optional padlock
+crypto/via/padlock_cipher.c optional padlock
+crypto/via/padlock_hash.c optional padlock
dev/advansys/adv_isa.c optional adv isa
dev/aic/aic_isa.c optional aic isa
dev/arcmsr/arcmsr.c optional arcmsr pci
@@ -159,6 +158,7 @@
dev/ce/if_ce.c optional ce
dev/ce/tau32-ddk.c optional ce
dev/cm/if_cm_isa.c optional cm isa
+dev/coretemp/coretemp.c optional coretemp
dev/cp/cpddk.c optional cp
dev/cp/if_cp.c optional cp
dev/ctau/ctau.c optional ctau
@@ -172,9 +172,7 @@
dev/ed/if_ed_wd80x3.c optional ed isa
dev/ed/if_ed_hpp.c optional ed isa ed_hpp
dev/ed/if_ed_sic.c optional ed isa ed_sic
-dev/fb/fb.c optional fb
-dev/fb/fb.c optional vga
-dev/fb/splash.c optional splash
+dev/fb/fb.c optional fb | vga
dev/fb/vga.c optional vga
dev/fdc/fdc.c optional fdc
dev/fdc/fdc_acpi.c optional fdc
@@ -186,6 +184,9 @@
dev/hptmv/gui_lib.c optional hptmv
dev/hptmv/hptproc.c optional hptmv
dev/hptmv/ioctl.c optional hptmv
+dev/hptrr/hptrr_os_bsd.c optional hptrr
+dev/hptrr/hptrr_osm_bsd.c optional hptrr
+dev/hptrr/hptrr_config.c optional hptrr
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_pentium.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
@@ -194,55 +195,51 @@
dev/ichwd/ichwd.c optional ichwd
dev/if_ndis/if_ndis.c optional ndis
dev/if_ndis/if_ndis_pccard.c optional ndis pccard
-dev/if_ndis/if_ndis_pci.c optional ndis cardbus
-dev/if_ndis/if_ndis_pci.c optional ndis pci
+dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci
dev/if_ndis/if_ndis_usb.c optional ndis usb
dev/io/iodev.c optional io
-dev/kbd/kbd.c optional atkbd
-dev/kbd/kbd.c optional sc
-dev/kbd/kbd.c optional ukbd
-dev/kbd/kbd.c optional vt
-dev/lnc/if_lnc_isa.c optional lnc isa
+dev/ipmi/ipmi.c optional ipmi
+dev/ipmi/ipmi_acpi.c optional ipmi acpi
+dev/ipmi/ipmi_isa.c optional ipmi isa
+dev/ipmi/ipmi_kcs.c optional ipmi
+dev/ipmi/ipmi_smic.c optional ipmi
+dev/ipmi/ipmi_smbus.c optional ipmi smbus
+dev/ipmi/ipmi_smbios.c optional ipmi
+dev/ipmi/ipmi_ssif.c optional ipmi smbus
+dev/ipmi/ipmi_pci.c optional ipmi pci
+dev/kbd/kbd.c optional atkbd | sc | ukbd | vt
+dev/le/if_le_isa.c optional le isa
dev/mem/memutil.c optional mem
dev/mse/mse.c optional mse
dev/mse/mse_isa.c optional mse isa
+dev/nfe/if_nfe.c optional nfe pci
dev/nve/if_nve.c optional nve pci
-dev/ppc/ppc.c optional ppc
-dev/ppc/ppc_puc.c optional ppc puc pci
+dev/nvram/nvram.c optional nvram isa
+dev/pcf/pcf_isa.c optional pcf
dev/random/nehemiah.c optional random
-dev/rr232x/os_bsd.c optional rr232x
-dev/rr232x/osm_bsd.c optional rr232x
-dev/rr232x/rr232x_config.c optional rr232x
dev/sbni/if_sbni.c optional sbni
dev/sbni/if_sbni_isa.c optional sbni isa
dev/sbni/if_sbni_pci.c optional sbni pci
dev/sio/sio.c optional sio
dev/sio/sio_isa.c optional sio isa
+dev/sio/sio_pccard.c optional sio pccard
+dev/sio/sio_pci.c optional sio pci
+dev/sio/sio_puc.c optional sio puc
dev/speaker/spkr.c optional speaker
dev/sr/if_sr_isa.c optional sr isa
dev/syscons/apm/apm_saver.c optional apm_saver apm
-dev/syscons/schistory.c optional sc
-dev/syscons/scmouse.c optional sc
-dev/syscons/scterm.c optional sc
-dev/syscons/scterm-dumb.c optional sc
dev/syscons/scterm-sc.c optional sc
dev/syscons/scvesactl.c optional sc vga vesa
dev/syscons/scvgarndr.c optional sc vga
-dev/syscons/scvidctl.c optional sc
dev/syscons/scvtb.c optional sc
-dev/syscons/syscons.c optional sc
-dev/syscons/sysmouse.c optional sc
dev/uart/uart_cpu_i386.c optional uart
-geom/geom_bsd.c standard
-geom/geom_bsd_enc.c standard
-geom/geom_mbr.c standard
-geom/geom_mbr_enc.c standard
dev/acpica/acpi_if.m standard
+dev/wpi/if_wpi.c optional wpi
i386/acpica/OsdEnvironment.c optional acpi
i386/acpica/acpi_machdep.c optional acpi
i386/acpica/acpi_wakeup.c optional acpi
acpi_wakecode.h optional acpi \
- dependency "$S/i386/acpica/acpi_wakecode.S" \
+ dependency "$S/i386/acpica/acpi_wakecode.S assym.s" \
compile-with "${MAKE} -f $S/i386/acpica/Makefile MAKESRCPATH=$S/i386/acpica" \
no-obj no-implicit-rule before-depend \
clean "acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin"
@@ -264,13 +261,13 @@
i386/i386/autoconf.c standard
i386/i386/bios.c standard
i386/i386/bioscall.s standard
+i386/i386/bpf_jit_machdep.c optional bpf_jitter
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/dump_machdep.c standard
-i386/i386/elan-mmcr.c optional cpu_elan
-i386/i386/elan-mmcr.c optional cpu_soekris
+i386/i386/elan-mmcr.c optional cpu_elan | cpu_soekris
i386/i386/elf_machdep.c standard
i386/i386/exception.s standard
i386/i386/gdb_machdep.c optional gdb
@@ -289,15 +286,16 @@
i386/i386/longrun.c optional cpu_enable_longrun
i386/i386/machdep.c standard
i386/i386/mem.c optional mem
+i386/i386/minidump_machdep.c standard
i386/i386/mp_clock.c optional smp
i386/i386/mp_machdep.c optional smp
i386/i386/mp_watchdog.c optional mp_watchdog smp
i386/i386/mpboot.s optional smp
i386/i386/mptable.c optional apic
i386/i386/mptable_pci.c optional apic pci
+i386/i386/msi.c optional apic pci
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/ptrace_machdep.c standard
i386/i386/support.s standard
@@ -331,20 +329,11 @@
#i386/isa/atpic_vector.s standard
i386/isa/clock.c standard
i386/isa/elcr.c standard
-i386/isa/elink.c optional ep
-i386/isa/elink.c optional ie
-i386/isa/if_el.c optional el
+i386/isa/elink.c optional ep | ie
i386/isa/isa.c optional isa
i386/isa/isa_dma.c optional isa
i386/isa/nmi.c standard
i386/isa/npx.c optional npx
-i386/isa/pcf.c optional pcf
-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/pmtimer.c optional pmtimer
i386/isa/prof_machdep.c optional profiling-routine
i386/isa/spic.c optional spic
@@ -355,6 +344,8 @@
dependency "linux_assym.h"
i386/linux/linux_machdep.c optional compat_linux
i386/linux/linux_ptrace.c optional compat_linux
+i386/linux/linux_support.s optional compat_linux \
+ dependency "linux_assym.h"
i386/linux/linux_sysent.c optional compat_linux
i386/linux/linux_sysvec.c optional compat_linux
i386/pci/pci_bus.c optional pci
@@ -367,22 +358,11 @@
#
# isdn4bsd, needed for isic | iwic | ifpi | ifpi2 | ihfc | ifpnp | itjc
#
-i4b/layer1/i4b_hdlc.c optional itjc
-i4b/layer1/i4b_hdlc.c optional ihfc
-i4b/layer1/i4b_l1dmux.c optional isic
-i4b/layer1/i4b_l1lib.c optional isic
-i4b/layer1/i4b_l1dmux.c optional iwic
-i4b/layer1/i4b_l1lib.c optional iwic
-i4b/layer1/i4b_l1dmux.c optional ifpi
-i4b/layer1/i4b_l1lib.c optional ifpi
-i4b/layer1/i4b_l1dmux.c optional ifpi2
-i4b/layer1/i4b_l1lib.c optional ifpi2
-i4b/layer1/i4b_l1dmux.c optional ihfc
-i4b/layer1/i4b_l1lib.c optional ihfc
-i4b/layer1/i4b_l1dmux.c optional ifpnp
-i4b/layer1/i4b_l1lib.c optional ifpnp
-i4b/layer1/i4b_l1dmux.c optional itjc
-i4b/layer1/i4b_l1lib.c optional itjc
+i4b/layer1/i4b_hdlc.c optional ihfc | itjc
+i4b/layer1/i4b_l1dmux.c optional ifpi | ifpi2 | ifpnp | \
+ ihfc | isic | itjc | iwic
+i4b/layer1/i4b_l1lib.c optional ifpi | ifpi2 | ifpnp | \
+ ihfc | isic | itjc | iwic
#
# isdn4bsd, isic
#
@@ -460,6 +440,7 @@
libkern/divdi3.c standard
libkern/ffsl.c standard
libkern/flsl.c standard
+libkern/memset.c standard
libkern/moddi3.c standard
libkern/qdivrem.c standard
libkern/ucmpdi2.c standard
@@ -474,3 +455,7 @@
pci/agp_nvidia.c optional agp
pci/agp_sis.c optional agp
pci/agp_via.c optional agp
+i386/xbox/xbox.c optional xbox
+i386/xbox/xboxfb.c optional xboxfb
+dev/fb/boot_font.c optional xboxfb
+i386/xbox/pic16l.s optional xbox
Index: files
===================================================================
RCS file: /home/cvs/src/sys/conf/files,v
retrieving revision 1.11
retrieving revision 1.12
diff -L sys/conf/files -L sys/conf/files -u -r1.11 -r1.12
--- sys/conf/files
+++ sys/conf/files
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1031.2.22 2006/02/23 02:13:30 mlaier Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1243.2.2 2007/12/06 10:15:29 rwatson Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -9,14 +9,9 @@
compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
no-obj no-implicit-rule before-depend \
clean "acpi_quirks.h"
-aicasm optional ahc \
- dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \
- compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
- no-obj no-implicit-rule \
- clean "aicasm* y.tab.h"
-aicasm optional ahd \
- dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \
- compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
+aicasm optional ahc | ahd \
+ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \
+ compile-with "CC='${CC}' ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
no-obj no-implicit-rule \
clean "aicasm* y.tab.h"
aic7xxx_seq.h optional ahc \
@@ -55,12 +50,22 @@
aic79xx_reg_print.o optional ahd pci ahd_reg_pretty_print \
compile-with "${NORMAL_C}" \
no-implicit-rule local
-emu10k1-alsa%diked.h optional snd_emu10k1 pci \
+emu10k1-alsa%diked.h optional snd_emu10k1 | snd_emu10kx \
dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \
- compile-with "CC=${CC} AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \
+ compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \
no-obj no-implicit-rule before-depend \
clean "emu10k1-alsa%diked.h"
-miidevs.h optional miibus \
+p16v-alsa%diked.h optional snd_emu10kx pci \
+ dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h" \
+ compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h p16v-alsa%diked.h" \
+ no-obj no-implicit-rule before-depend \
+ clean "p16v-alsa%diked.h"
+p17v-alsa%diked.h optional snd_emu10kx pci \
+ dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h" \
+ compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h p17v-alsa%diked.h" \
+ no-obj no-implicit-rule before-depend \
+ clean "p17v-alsa%diked.h"
+miidevs.h optional miibus | mii \
dependency "$S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
compile-with "${AWK} -f $S/tools/miidevs2h.awk $S/dev/mii/miidevs" \
no-obj no-implicit-rule before-depend \
@@ -89,36 +94,29 @@
cam/scsi/scsi_cd.c optional cd
cam/scsi/scsi_ch.c optional ch
cam/scsi/scsi_da.c optional da
-cam/scsi/scsi_low.c optional ct
-cam/scsi/scsi_low.c optional ncv
-cam/scsi/scsi_low.c optional nsp
-cam/scsi/scsi_low.c optional stg
-cam/scsi/scsi_low_pisa.c optional ct
-cam/scsi/scsi_low_pisa.c optional ncv
-cam/scsi/scsi_low_pisa.c optional nsp
-cam/scsi/scsi_low_pisa.c optional stg
+cam/scsi/scsi_low.c optional ct | ncv | nsp | stg
+cam/scsi/scsi_low_pisa.c optional ct | ncv | nsp | stg
cam/scsi/scsi_pass.c optional pass
cam/scsi/scsi_pt.c optional pt
cam/scsi/scsi_sa.c optional sa
cam/scsi/scsi_ses.c optional ses
+cam/scsi/scsi_sg.c optional sg
cam/scsi/scsi_targ_bh.c optional targbh
cam/scsi/scsi_target.c optional targ
-coda/coda_fbsd.c optional vcoda
-coda/coda_namecache.c optional vcoda
-coda/coda_psdev.c optional vcoda
-coda/coda_subr.c optional vcoda
-coda/coda_venus.c optional vcoda
-coda/coda_vfsops.c optional vcoda
-coda/coda_vnops.c optional vcoda
-compat/linprocfs/linprocfs.c optional linprocfs
-contrib/altq/altq/altq_cbq.c optional altq
+contrib/altq/altq/altq_cbq.c optional altq \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/altq/altq/altq_cdnr.c optional altq
-contrib/altq/altq/altq_hfsc.c optional altq
-contrib/altq/altq/altq_priq.c optional altq
-contrib/altq/altq/altq_red.c optional altq
-contrib/altq/altq/altq_rio.c optional altq
+contrib/altq/altq/altq_hfsc.c optional altq \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/altq/altq/altq_priq.c optional altq \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/altq/altq/altq_red.c optional altq \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/altq/altq/altq_rio.c optional altq \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/altq/altq/altq_rmclass.c optional altq
-contrib/altq/altq/altq_subr.c optional altq
+contrib/altq/altq/altq_subr.c optional altq \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/dev/acpica/dbcmds.c optional acpi acpi_debug
contrib/dev/acpica/dbdisply.c optional acpi acpi_debug
contrib/dev/acpica/dbexec.c optional acpi acpi_debug
@@ -202,6 +200,7 @@
contrib/dev/acpica/nsxfname.c optional acpi
contrib/dev/acpica/nsxfobj.c optional acpi
contrib/dev/acpica/psargs.c optional acpi
+contrib/dev/acpica/psloop.c optional acpi
contrib/dev/acpica/psopcode.c optional acpi
contrib/dev/acpica/psparse.c optional acpi
contrib/dev/acpica/psscope.c optional acpi
@@ -213,6 +212,7 @@
contrib/dev/acpica/rscalc.c optional acpi
contrib/dev/acpica/rscreate.c optional acpi
contrib/dev/acpica/rsdump.c optional acpi
+contrib/dev/acpica/rsinfo.c optional acpi
contrib/dev/acpica/rsio.c optional acpi
contrib/dev/acpica/rsirq.c optional acpi
contrib/dev/acpica/rslist.c optional acpi
@@ -220,15 +220,14 @@
contrib/dev/acpica/rsmisc.c optional acpi
contrib/dev/acpica/rsutils.c optional acpi
contrib/dev/acpica/rsxface.c optional acpi
-contrib/dev/acpica/tbconvrt.c optional acpi
-contrib/dev/acpica/tbget.c optional acpi
-contrib/dev/acpica/tbgetall.c optional acpi
+contrib/dev/acpica/tbfadt.c optional acpi
+contrib/dev/acpica/tbfind.c optional acpi
contrib/dev/acpica/tbinstal.c optional acpi
-contrib/dev/acpica/tbrsdt.c optional acpi
contrib/dev/acpica/tbutils.c optional acpi
contrib/dev/acpica/tbxface.c optional acpi
contrib/dev/acpica/tbxfroot.c optional acpi
contrib/dev/acpica/utalloc.c optional acpi
+contrib/dev/acpica/utcache.c optional acpi
contrib/dev/acpica/utclib.c optional acpi
contrib/dev/acpica/utcopy.c optional acpi
contrib/dev/acpica/utdebug.c optional acpi
@@ -238,82 +237,117 @@
contrib/dev/acpica/utinit.c optional acpi
contrib/dev/acpica/utmath.c optional acpi
contrib/dev/acpica/utmisc.c optional acpi
+contrib/dev/acpica/utmutex.c optional acpi
contrib/dev/acpica/utobject.c optional acpi
+contrib/dev/acpica/utresrc.c optional acpi
+contrib/dev/acpica/utstate.c optional acpi
contrib/dev/acpica/utxface.c optional acpi
-contrib/dev/ath/freebsd/ah_osdep.c optional ath_hal
-contrib/ipfilter/netinet/fil.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_frag.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_log.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_state.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_lookup.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_pool.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_htable.c optional ipfilter inet
-contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet
-contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet
-contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_dump.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_port.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_sig.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/cc_user.c optional ngatm_ccatm
-contrib/ngatm/netnatm/api/unisap.c optional ngatm_ccatm
-contrib/ngatm/netnatm/misc/straddr.c optional ngatm_atmbase
-contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase
-contrib/ngatm/netnatm/msg/traffic.c optional ngatm_atmbase
-contrib/ngatm/netnatm/msg/uni_ie.c optional ngatm_atmbase
-contrib/ngatm/netnatm/msg/uni_msg.c optional ngatm_atmbase
-contrib/ngatm/netnatm/saal/saal_sscfu.c optional ngatm_sscfu
-contrib/ngatm/netnatm/saal/saal_sscop.c optional ngatm_sscop
-contrib/ngatm/netnatm/sig/sig_call.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_coord.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_party.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_print.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_reset.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_uni.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni
-contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni
-contrib/pf/net/if_pflog.c optional pflog
-contrib/pf/net/if_pfsync.c optional pfsync
-contrib/pf/net/pf.c optional pf
-contrib/pf/net/pf_if.c optional pf
-contrib/pf/net/pf_subr.c optional pf
-contrib/pf/net/pf_ioctl.c optional pf
-contrib/pf/net/pf_norm.c optional pf
-contrib/pf/net/pf_table.c optional pf
-contrib/pf/net/pf_osfp.c optional pf
+contrib/ipfilter/netinet/fil.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_auth.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_fil_freebsd.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_frag.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_log.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_nat.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_proxy.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_state.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_lookup.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -Wno-error -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_pool.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_htable.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/ip_sync.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet \
+ compile-with "${NORMAL_C} -I$S/contrib/ipfilter"
+contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \
+ compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_dump.c optional ngatm_ccatm \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_port.c optional ngatm_ccatm \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_sig.c optional ngatm_ccatm \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/cc_user.c optional ngatm_ccatm \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/api/unisap.c optional ngatm_ccatm \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/misc/straddr.c optional ngatm_atmbase \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/misc/unimsg_common.c optional ngatm_atmbase \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/msg/traffic.c optional ngatm_atmbase \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/msg/uni_ie.c optional ngatm_atmbase \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/msg/uni_msg.c optional ngatm_atmbase \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/saal/saal_sscfu.c optional ngatm_sscfu \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/saal/saal_sscop.c optional ngatm_sscop \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_call.c optional ngatm_uni \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_coord.c optional ngatm_uni \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_party.c optional ngatm_uni \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_print.c optional ngatm_uni \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_reset.c optional ngatm_uni \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_uni.c optional ngatm_uni \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_unimsgcpy.c optional ngatm_uni \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+contrib/pf/net/if_pflog.c optional pflog \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/if_pfsync.c optional pfsync \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf.c optional pf \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_if.c optional pf \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_ioctl.c optional pf \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_norm.c optional pf \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_osfp.c optional pf \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_ruleset.c optional pf \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_subr.c optional pf \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
+contrib/pf/net/pf_table.c optional pf \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/pf/netinet/in4_cksum.c optional pf inet
-crypto/blowfish/bf_ecb.c optional ipsec ipsec_esp
-crypto/blowfish/bf_skey.c optional crypto
-crypto/blowfish/bf_skey.c optional ipsec ipsec_esp
-crypto/des/des_ecb.c optional crypto
-crypto/des/des_ecb.c optional ipsec ipsec_esp
-crypto/des/des_ecb.c optional netsmbcrypto
-crypto/des/des_setkey.c optional crypto
-crypto/des/des_setkey.c optional ipsec ipsec_esp
-crypto/des/des_setkey.c optional netsmbcrypto
+crypto/blowfish/bf_ecb.c optional ipsec
+crypto/blowfish/bf_skey.c optional crypto | ipsec
+crypto/camellia/camellia.c optional crypto | ipsec
+crypto/camellia/camellia-api.c optional crypto | ipsec
+crypto/des/des_ecb.c optional crypto | ipsec | netsmb
+crypto/des/des_setkey.c optional crypto | ipsec | netsmb
crypto/rc4/rc4.c optional netgraph_mppc_encryption
-crypto/rijndael/rijndael-alg-fst.c optional crypto
-crypto/rijndael/rijndael-alg-fst.c optional geom_bde
-crypto/rijndael/rijndael-alg-fst.c optional ipsec
-crypto/rijndael/rijndael-alg-fst.c optional random
-crypto/rijndael/rijndael-alg-fst.c optional wlan_ccmp
-crypto/rijndael/rijndael-api-fst.c optional geom_bde
-crypto/rijndael/rijndael-api-fst.c optional random
-crypto/rijndael/rijndael-api.c optional crypto
-crypto/rijndael/rijndael-api.c optional ipsec
-crypto/rijndael/rijndael-api.c optional wlan_ccmp
-crypto/sha1.c optional carp
-crypto/sha1.c optional netgraph_mppc_encryption
-crypto/sha1.c optional crypto
-crypto/sha1.c optional ipsec
-crypto/sha2/sha2.c optional crypto
-crypto/sha2/sha2.c optional geom_bde
-crypto/sha2/sha2.c optional ipsec
-crypto/sha2/sha2.c optional random
+crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \
+ ipsec | random | wlan_ccmp
+crypto/rijndael/rijndael-api-fst.c optional geom_bde | random
+crypto/rijndael/rijndael-api.c optional crypto | ipsec | wlan_ccmp
+crypto/sha1.c optional carp | crypto | ipsec | \
+ netgraph_mppc_encryption | sctp
+crypto/sha2/sha2.c optional crypto | geom_bde | ipsec | random | \
+ sctp
ddb/db_access.c optional ddb
ddb/db_break.c optional ddb
ddb/db_command.c optional ddb
@@ -338,6 +372,7 @@
dev/aac/aac_disk.c optional aac
dev/aac/aac_linux.c optional aac compat_linux
dev/aac/aac_pci.c optional aac pci
+dev/acpi_support/acpi_aiboost.c optional acpi_aiboost acpi
dev/acpi_support/acpi_asus.c optional acpi_asus acpi
dev/acpi_support/acpi_fujitsu.c optional acpi_fujitsu acpi
dev/acpi_support/acpi_ibm.c optional acpi_ibm acpi
@@ -359,6 +394,7 @@
dev/acpica/acpi_cmbat.c optional acpi
dev/acpica/acpi_cpu.c optional acpi
dev/acpica/acpi_ec.c optional acpi
+dev/acpica/acpi_hpet.c optional acpi
dev/acpica/acpi_isab.c optional acpi isa
dev/acpica/acpi_lid.c optional acpi
dev/acpica/acpi_package.c optional acpi
@@ -376,6 +412,7 @@
dev/acpica/acpi_throttle.c optional acpi
dev/acpica/acpi_timer.c optional acpi
dev/acpica/acpi_video.c optional acpi_video acpi
+dev/acpica/acpi_dock.c optional acpi_dock acpi
dev/adlink/adlink.c optional adlink
dev/advansys/adv_eisa.c optional adv eisa
dev/advansys/adv_pci.c optional adv pci
@@ -427,15 +464,22 @@
dev/ata/ata-pci.c optional ata pci
dev/ata/ata-queue.c optional ata
dev/ata/ata-raid.c optional ataraid
+dev/ata/ata-usb.c optional atausb
dev/ata/atapi-cam.c optional atapicam
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
dev/ata/atapi-tape.c optional atapist
-dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr
-dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe
-dev/ath/ath_rate/sample/sample.c optional ath_rate_sample
-dev/ath/if_ath.c optional ath
-dev/ath/if_ath_pci.c optional ath pci
+dev/ath/ah_osdep.c optional ath_hal \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr
+dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/if_ath.c optional ath \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
+dev/ath/if_ath_pci.c optional ath pci \
+ compile-with "${NORMAL_C} -I$S/dev/ath"
dev/awi/am79c930.c optional awi
dev/awi/awi.c optional awi
dev/awi/if_awi_pccard.c optional awi pccard
@@ -456,7 +500,7 @@
dev/buslogic/bt_pci.c optional bt pci
dev/cardbus/cardbus.c optional cardbus
dev/cardbus/cardbus_cis.c optional cardbus
-#dev/cardbus/cardbus_device.c optional cardbus
+dev/cardbus/cardbus_device.c optional cardbus
dev/ciss/ciss.c optional ciss
dev/cm/smc90cx6.c optional cm
dev/cnw/if_cnw.c optional cnw pccard
@@ -464,12 +508,29 @@
dev/cs/if_cs.c optional cs
dev/cs/if_cs_isa.c optional cs isa
dev/cs/if_cs_pccard.c optional cs pccard
+dev/cxgb/cxgb_main.c optional cxgb pci
+dev/cxgb/cxgb_offload.c optional cxgb pci
+dev/cxgb/cxgb_l2t.c optional cxgb pci
+dev/cxgb/cxgb_lro.c optional cxgb pci
+dev/cxgb/cxgb_sge.c optional cxgb pci
+dev/cxgb/common/cxgb_mc5.c optional cxgb pci
+dev/cxgb/common/cxgb_vsc7323.c optional cxgb pci
+dev/cxgb/common/cxgb_vsc8211.c optional cxgb pci
+dev/cxgb/common/cxgb_ael1002.c optional cxgb pci
+dev/cxgb/common/cxgb_mv88e1xxx.c optional cxgb pci
+dev/cxgb/common/cxgb_xgmac.c optional cxgb pci
+dev/cxgb/common/cxgb_t3_hw.c optional cxgb pci
+dev/cxgb/sys/uipc_mvec.c optional cxgb pci
dev/cy/cy.c optional cy
dev/cy/cy_isa.c optional cy isa
dev/cy/cy_pci.c optional cy pci
+dev/dc/if_dc.c optional dc pci
+dev/dc/dcphy.c optional dc pci
+dev/dc/pnphy.c optional dc pci
dev/dcons/dcons.c optional dcons
dev/dcons/dcons_crom.c optional dcons_crom
dev/dcons/dcons_os.c optional dcons
+dev/de/if_de.c optional de pci
dev/digi/CX.c optional digi_CX
dev/digi/CX_PCI.c optional digi_CX_PCI
dev/digi/EPCX.c optional digi_EPCX
@@ -534,13 +595,39 @@
dev/drm/tdfx_drv.c optional tdfxdrm
dev/ed/if_ed.c optional ed
dev/ed/if_ed_novell.c optional ed
+dev/ed/if_ed_rtl80x9.c optional ed
dev/ed/if_ed_pccard.c optional ed pccard
dev/ed/if_ed_pci.c optional ed pci
-dev/ed/if_ed_rtl80x9.c optional ed
dev/eisa/eisa_if.m standard
dev/eisa/eisaconf.c optional eisa
-dev/em/if_em.c optional em
-dev/em/if_em_hw.c optional em
+dev/em/if_em.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_80003es2lan.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_82540.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_82541.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_82542.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_82543.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_82571.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_82575.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_api.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_ich8lan.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_mac.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_manage.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_nvm.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
+dev/em/e1000_phy.c optional em \
+ compile-with "${NORMAL_C} -I$S/dev/em"
dev/en/if_en_pci.c optional en pci
dev/en/midway.c optional en
dev/ep/if_ep.c optional ep
@@ -551,9 +638,10 @@
dev/esp/ncr53c9x.c optional esp
dev/ex/if_ex.c optional ex
dev/ex/if_ex_isa.c optional ex isa
-#dev/ex/if_ex_pccard.c optional ex pccard
+dev/ex/if_ex_pccard.c optional ex pccard
dev/exca/exca.c optional cbb
dev/fatm/if_fatm.c optional fatm pci
+dev/fb/splash.c optional splash
dev/fe/if_fe.c optional fe
dev/fe/if_fe_pccard.c optional fe pccard
dev/firewire/firewire.c optional firewire
@@ -567,35 +655,37 @@
dev/firewire/if_fwip.c optional fwip
dev/firewire/sbp.c optional sbp
dev/firewire/sbp_targ.c optional sbp_targ
+dev/flash/at45d.c optional at45d
dev/fxp/if_fxp.c optional fxp
dev/gem/if_gem.c optional gem
dev/gem/if_gem_pci.c optional gem pci
-dev/harp/if_harp.c optional harp pci
+#dev/harp/if_harp.c optional harp pci
dev/hatm/if_hatm.c optional hatm pci
dev/hatm/if_hatm_intr.c optional hatm pci
dev/hatm/if_hatm_ioctl.c optional hatm pci
dev/hatm/if_hatm_rx.c optional hatm pci
dev/hatm/if_hatm_tx.c optional hatm pci
-dev/hfa/fore_buffer.c optional hfa
-dev/hfa/fore_command.c optional hfa
-dev/hfa/fore_globals.c optional hfa
-dev/hfa/fore_if.c optional hfa
-dev/hfa/fore_init.c optional hfa
-dev/hfa/fore_intr.c optional hfa
-dev/hfa/fore_output.c optional hfa
-dev/hfa/fore_receive.c optional hfa
-dev/hfa/fore_stats.c optional hfa
-dev/hfa/fore_timer.c optional hfa
-dev/hfa/fore_transmit.c optional hfa
-dev/hfa/fore_vcm.c optional hfa
-#dev/hfa/hfa_eisa.c optional hfa eisa
-dev/hfa/hfa_freebsd.c optional hfa
-dev/hfa/hfa_pci.c optional hfa pci
-#dev/hfa/hfa_sbus.c optional hfa sbus
+#dev/hfa/fore_buffer.c optional hfa
+#dev/hfa/fore_command.c optional hfa
+#dev/hfa/fore_globals.c optional hfa
+#dev/hfa/fore_if.c optional hfa
+#dev/hfa/fore_init.c optional hfa
+#dev/hfa/fore_intr.c optional hfa
+#dev/hfa/fore_output.c optional hfa
+#dev/hfa/fore_receive.c optional hfa
+#dev/hfa/fore_stats.c optional hfa
+#dev/hfa/fore_timer.c optional hfa
+#dev/hfa/fore_transmit.c optional hfa
+#dev/hfa/fore_vcm.c optional hfa
+##dev/hfa/hfa_eisa.c optional hfa eisa
+#dev/hfa/hfa_freebsd.c optional hfa
+#dev/hfa/hfa_pci.c optional hfa pci
+##dev/hfa/hfa_sbus.c optional hfa sbus
dev/hifn/hifn7751.c optional hifn
dev/hme/if_hme.c optional hme
dev/hme/if_hme_pci.c optional hme pci
dev/hme/if_hme_sbus.c optional hme sbus
+dev/hptiop/hptiop.c optional hptiop cam
dev/hwpmc/hwpmc_logging.c optional hwpmc
dev/hwpmc/hwpmc_mod.c optional hwpmc
dev/ichsmb/ichsmb.c optional ichsmb
@@ -606,9 +696,13 @@
dev/ida/ida_pci.c optional ida pci
dev/ie/if_ie.c optional ie isa nowerror
dev/ie/if_ie_isa.c optional ie isa
-dev/ieee488/ibfoo.c optional pcii
+dev/ieee488/ibfoo.c optional pcii | tnt4882
dev/ieee488/pcii.c optional pcii
-dev/ieee488/upd7210.c optional pcii
+dev/ieee488/tnt4882.c optional tnt4882
+dev/ieee488/upd7210.c optional pcii | tnt4882
+dev/iicbus/ad7418.c optional ad7418
+dev/iicbus/ds1672.c optional ds1672
+dev/iicbus/icee.c optional icee
dev/iicbus/if_ic.c optional ic
dev/iicbus/iic.c optional iic
dev/iicbus/iicbb.c optional iicbb
@@ -627,6 +721,12 @@
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
dev/ipw/if_ipw.c optional ipw
+dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
+dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
+dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
+dev/iscsi/initiator/isc_soc.c optional iscsi_initiator scbus
+dev/iscsi/initiator/isc_sm.c optional iscsi_initiator scbus
+dev/iscsi/initiator/isc_subr.c optional iscsi_initiator scbus
dev/isp/isp.c optional isp
dev/isp/isp_freebsd.c optional isp
dev/isp/isp_library.c optional isp
@@ -638,6 +738,16 @@
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
+dev/ixgbe/ixgbe.c optional ixgbe \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_phy.c optional ixgbe \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_api.c optional ixgbe \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_common.c optional ixgbe \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
+dev/ixgbe/ixgbe_82598.c optional ixgbe \
+ compile-with "${NORMAL_C} -I$S/dev/ixgbe"
dev/joy/joy.c optional joy
dev/joy/joy_isa.c optional joy isa
dev/joy/joy_pccard.c optional joy pccard
@@ -648,59 +758,86 @@
dev/le/lance.c optional le
dev/led/led.c standard
dev/lge/if_lge.c optional lge
-dev/lnc/if_lnc.c optional lnc
-dev/lnc/if_lnc_pci.c optional lnc pci
+dev/lmc/if_lmc.c optional lmc
dev/mc146818/mc146818.c optional mc146818
dev/mca/mca_bus.c optional mca
dev/mcd/mcd.c optional mcd isa nowerror
dev/mcd/mcd_isa.c optional mcd isa nowerror
dev/md/md.c optional md
dev/mem/memdev.c optional mem
-dev/mii/acphy.c optional miibus
-dev/mii/amphy.c optional miibus
-dev/mii/bmtphy.c optional miibus
-dev/mii/brgphy.c optional miibus
-dev/mii/ciphy.c optional miibus
-dev/mii/dcphy.c optional miibus pci
-dev/mii/e1000phy.c optional miibus
-dev/mii/exphy.c optional miibus
-dev/mii/inphy.c optional miibus
-dev/mii/lxtphy.c optional miibus
dev/mfi/mfi.c optional mfi
+dev/mfi/mfi_debug.c optional mfi
dev/mfi/mfi_pci.c optional mfi pci
dev/mfi/mfi_disk.c optional mfi
-dev/mii/mii.c optional miibus
-dev/mii/mii_physubr.c optional miibus
-dev/mii/miibus_if.m optional miibus
-dev/mii/mlphy.c optional miibus
-dev/mii/nsgphy.c optional miibus
-dev/mii/nsphy.c optional miibus
-dev/mii/pnaphy.c optional miibus
-dev/mii/pnphy.c optional miibus
-dev/mii/qsphy.c optional miibus
-dev/mii/rgephy.c optional miibus
-dev/mii/rlphy.c optional miibus
-dev/mii/ruephy.c optional miibus
-dev/mii/tdkphy.c optional miibus
-dev/mii/tlphy.c optional miibus
-dev/mii/ukphy.c optional miibus
-dev/mii/ukphy_subr.c optional miibus
-dev/mii/xmphy.c optional miibus
+dev/mfi/mfi_linux.c optional mfi compat_linux
+dev/mfi/mfi_cam.c optional mfip scbus
+dev/mii/acphy.c optional miibus | acphy
+dev/mii/amphy.c optional miibus | amphy
+dev/mii/bmtphy.c optional miibus | bmtphy
+dev/mii/brgphy.c optional miibus | brgphy
+dev/mii/ciphy.c optional miibus | ciphy
+dev/mii/e1000phy.c optional miibus | e1000phy
+# XXX only xl cards?
+dev/mii/exphy.c optional miibus | exphy
+dev/mii/gentbi.c optional miibus | gentbi
+dev/mii/icsphy.c optional miibus | icsphy
+# XXX only fxp cards?
+dev/mii/inphy.c optional miibus | inphy
+dev/mii/ip1000phy.c optional miibus | ip1000phy
+dev/mii/lxtphy.c optional miibus | lxtphy
+dev/mii/mii.c optional miibus | mii
+dev/mii/mii_physubr.c optional miibus | mii
+dev/mii/miibus_if.m optional miibus | mii
+dev/mii/mlphy.c optional miibus | mlphy
+dev/mii/nsgphy.c optional miibus | nsgphy
+dev/mii/nsphy.c optional miibus | nsphy
+dev/mii/pnaphy.c optional miibus | pnaphy
+dev/mii/qsphy.c optional miibus | qsphy
+dev/mii/rgephy.c optional miibus | rgephy
+dev/mii/rlphy.c optional miibus | rlphy
+dev/mii/rlswitch.c optional rlswitch
+# XXX rue only?
+dev/mii/ruephy.c optional miibus | ruephy
+dev/mii/tdkphy.c optional miibus | tdkphy
+dev/mii/tlphy.c optional miibus | tlphy
+dev/mii/ukphy.c optional miibus | mii
+dev/mii/ukphy_subr.c optional miibus | mii
+dev/mii/xmphy.c optional miibus | xmphy
dev/mk48txx/mk48txx.c optional mk48txx
dev/mlx/mlx.c optional mlx
dev/mlx/mlx_disk.c optional mlx
dev/mlx/mlx_pci.c optional mlx pci
dev/mly/mly.c optional mly
+dev/mmc/mmc.c optional mmc
+dev/mmc/mmcbr_if.m standard
+dev/mmc/mmcbus_if.m standard
+dev/mmc/mmcsd.c optional mmcsd
dev/mpt/mpt.c optional mpt
dev/mpt/mpt_cam.c optional mpt
dev/mpt/mpt_debug.c optional mpt
dev/mpt/mpt_pci.c optional mpt pci
dev/mpt/mpt_raid.c optional mpt
dev/msk/if_msk.c optional msk
+dev/mxge/if_mxge.c optional mxge pci
+dev/mxge/mxge_lro.c optional mxge pci
+dev/mxge/mxge_eth_z8e.c optional mxge pci
+dev/mxge/mxge_ethp_z8e.c optional mxge pci
+dev/msk/if_msk.c optional msk
dev/my/if_my.c optional my
dev/ncv/ncr53c500.c optional ncv
dev/ncv/ncr53c500_pccard.c optional ncv pccard
dev/nge/if_nge.c optional nge
+dev/nxge/if_nxge.c optional nxge
+dev/nxge/xgehal/xgehal-device.c optional nxge
+dev/nxge/xgehal/xgehal-mm.c optional nxge
+dev/nxge/xgehal/xge-queue.c optional nxge
+dev/nxge/xgehal/xgehal-driver.c optional nxge
+dev/nxge/xgehal/xgehal-ring.c optional nxge
+dev/nxge/xgehal/xgehal-channel.c optional nxge
+dev/nxge/xgehal/xgehal-fifo.c optional nxge
+dev/nxge/xgehal/xgehal-stats.c optional nxge
+dev/nxge/xgehal/xgehal-config.c optional nxge
+dev/nxge/xgehal/xgehal-mgmt.c optional nxge
dev/nmdm/nmdm.c optional nmdm
dev/nsp/nsp.c optional nsp
dev/nsp/nsp_pccard.c optional nsp pccard
@@ -722,8 +859,10 @@
dev/pccbb/pccbb.c optional cbb
dev/pccbb/pccbb_isa.c optional cbb isa
dev/pccbb/pccbb_pci.c optional cbb pci
+dev/pcf/pcf.c optional pcf
dev/pci/eisa_pci.c optional pci eisa
dev/pci/fixup_pci.c optional pci
+dev/pci/hostb_pci.c optional pci
dev/pci/ignore_pci.c optional pci
dev/pci/isa_pci.c optional pci isa
dev/pci/pci.c optional pci
@@ -731,12 +870,11 @@
dev/pci/pci_pci.c optional pci
dev/pci/pci_user.c optional pci
dev/pci/pcib_if.m standard
+dev/pci/vga_pci.c optional pci
dev/pdq/if_fea.c optional fea eisa
dev/pdq/if_fpa.c optional fpa pci
-dev/pdq/pdq.c optional fea eisa nowerror
-dev/pdq/pdq.c optional fpa pci nowerror
-dev/pdq/pdq_ifsubr.c optional fea eisa nowerror
-dev/pdq/pdq_ifsubr.c optional fpa pci nowerror
+dev/pdq/pdq.c optional nowerror fea eisa | fpa pci
+dev/pdq/pdq_ifsubr.c optional nowerror fea eisa | fpa pci
dev/ppbus/if_plip.c optional plip
dev/ppbus/immio.c optional vpo
dev/ppbus/lpbb.c optional lpbb
@@ -751,19 +889,22 @@
dev/ppbus/pps.c optional pps
dev/ppbus/vpo.c optional vpo
dev/ppbus/vpoio.c optional vpo
+dev/ppc/ppc.c optional ppc
+dev/ppc/ppc_acpi.c optional ppc acpi
+dev/ppc/ppc_isa.c optional ppc isa
+dev/ppc/ppc_pci.c optional ppc pci
+dev/ppc/ppc_puc.c optional ppc puc
dev/pst/pst-iop.c optional pst
dev/pst/pst-pci.c optional pst pci
dev/pst/pst-raid.c optional pst
dev/puc/puc.c optional puc
-dev/puc/puc_ebus.c optional puc ebus
+dev/puc/puc_cfg.c optional puc
dev/puc/puc_pccard.c optional puc pccard
dev/puc/puc_pci.c optional puc pci
-dev/puc/puc_sbus.c optional puc fhc
-dev/puc/puc_sbus.c optional puc sbus
dev/puc/pucdata.c optional puc pci
-dev/ral/if_ral.c optional ral
+dev/ral/rt2560.c optional ral
+dev/ral/rt2661.c optional ral
dev/ral/if_ralrate.c optional ral
-dev/ral/if_ral_pccard.c optional ral pccard
dev/ral/if_ral_pci.c optional ral pci
dev/random/harvest.c standard
dev/random/hash.c optional random
@@ -778,9 +919,14 @@
dev/rp/rp.c optional rp
dev/rp/rp_isa.c optional rp isa
dev/rp/rp_pci.c optional rp pci
-dev/sab/sab.c optional sab ebus
dev/safe/safe.c optional safe
-dev/sbsh/if_sbsh.c optional sbsh
+dev/sbsh/if_sbsh.c optional sbsh
+dev/scc/scc_if.m optional scc
+dev/scc/scc_bfe_ebus.c optional scc ebus
+dev/scc/scc_bfe_sbus.c optional scc fhc | scc sbus
+dev/scc/scc_core.c optional scc
+dev/scc/scc_dev_sab82532.c optional scc
+dev/scc/scc_dev_z8530.c optional scc
dev/scd/scd.c optional scd isa
dev/scd/scd_isa.c optional scd isa
dev/si/si.c optional si
@@ -789,9 +935,7 @@
dev/si/si_eisa.c optional si eisa
dev/si/si_isa.c optional si isa
dev/si/si_pci.c optional si pci
-dev/sio/sio_pccard.c optional sio pccard
-dev/sio/sio_pci.c optional sio pci
-dev/sio/sio_puc.c optional sio puc pci
+dev/sk/if_sk.c optional sk pci
dev/smbus/smb.c optional smb
dev/smbus/smbconf.c optional smbus
dev/smbus/smbus.c optional smbus
@@ -800,8 +944,9 @@
dev/sn/if_sn_isa.c optional sn isa
dev/sn/if_sn_pccard.c optional sn pccard
dev/snp/snp.c optional snp
+dev/sound/clone.c optional sound
+dev/sound/unit.c optional sound
dev/sound/isa/ad1816.c optional snd_ad1816 isa
-dev/sound/isa/es1888.c optional snd_ess isa
dev/sound/isa/ess.c optional snd_ess isa
dev/sound/isa/gusc.c optional snd_gusc isa
dev/sound/isa/mss.c optional snd_mss isa
@@ -814,22 +959,42 @@
#dev/sound/pci/au88x0.c optional snd_au88x0 pci
dev/sound/pci/cmi.c optional snd_cmi pci
dev/sound/pci/cs4281.c optional snd_cs4281 pci
-dev/sound/pci/csa.c optional snd_csa pci
+dev/sound/pci/csa.c optional snd_csa pci \
+ warning "kernel contains GPL contaminated csaimg.h header"
dev/sound/pci/csapcm.c optional snd_csa pci
dev/sound/pci/ds1.c optional snd_ds1 pci
dev/sound/pci/emu10k1.c optional snd_emu10k1 pci \
- dependency "emu10k1-alsa%diked.h"
+ dependency "emu10k1-alsa%diked.h" \
+ warning "kernel contains GPL contaminated emu10k1 headers"
+dev/sound/pci/emu10kx.c optional snd_emu10kx pci \
+ dependency "emu10k1-alsa%diked.h" \
+ dependency "p16v-alsa%diked.h" \
+ dependency "p17v-alsa%diked.h" \
+ warning "kernel contains GPL contaminated emu10kx headers"
+dev/sound/pci/emu10kx-pcm.c optional snd_emu10kx pci \
+ dependency "emu10k1-alsa%diked.h" \
+ dependency "p16v-alsa%diked.h" \
+ dependency "p17v-alsa%diked.h" \
+ warning "kernel contains GPL contaminated emu10kx headers"
+dev/sound/pci/emu10kx-midi.c optional snd_emu10kx pci \
+ dependency "emu10k1-alsa%diked.h" \
+ warning "kernel contains GPL contaminated emu10kx headers"
+dev/sound/pci/envy24.c optional snd_envy24 pci
+dev/sound/pci/envy24ht.c optional snd_envy24ht pci
dev/sound/pci/es137x.c optional snd_es137x pci
dev/sound/pci/fm801.c optional snd_fm801 pci
dev/sound/pci/ich.c optional snd_ich pci
-dev/sound/pci/maestro.c optional snd_maestro pci
-dev/sound/pci/maestro3.c optional snd_maestro3 pci
+dev/sound/pci/maestro.c optional snd_maestro pci
+dev/sound/pci/maestro3.c optional snd_maestro3 pci \
+ warning "kernel contains GPL contaminated maestro3 headers"
dev/sound/pci/neomagic.c optional snd_neomagic pci
dev/sound/pci/solo.c optional snd_solo pci
+dev/sound/pci/spicds.c optional snd_spicds pci
dev/sound/pci/t4dwave.c optional snd_t4dwave pci
dev/sound/pci/via8233.c optional snd_via8233 pci
dev/sound/pci/via82c686.c optional snd_via82c686 pci
dev/sound/pci/vibes.c optional snd_vibes pci
+dev/sound/pci/hda/hdac.c optional snd_hda pci
dev/sound/pcm/ac97.c optional sound
dev/sound/pcm/ac97_if.m optional sound
dev/sound/pcm/ac97_patch.c optional sound
@@ -851,6 +1016,15 @@
#dev/sound/usb/upcm.c optional snd_upcm usb
dev/sound/usb/uaudio.c optional snd_uaudio usb
dev/sound/usb/uaudio_pcm.c optional snd_uaudio usb
+dev/sound/midi/midi.c optional sound
+dev/sound/midi/mpu401.c optional sound
+dev/sound/midi/mpu_if.m optional sound
+dev/sound/midi/mpufoi_if.m optional sound
+dev/sound/midi/sequencer.c optional sound
+dev/sound/midi/synth_if.m optional sound
+dev/spibus/spibus.c optional spibus \
+ dependency "spibus_if.h"
+dev/spibus/spibus_if.m optional spibus
dev/sr/if_sr.c optional sr
dev/sr/if_sr_pci.c optional sr pci
dev/stg/tmc18c30.c optional stg
@@ -858,11 +1032,8 @@
dev/stg/tmc18c30_pccard.c optional stg pccard
dev/stg/tmc18c30_pci.c optional stg pci
dev/stg/tmc18c30_subr.c optional stg
+dev/stge/if_stge.c optional stge
dev/streams/streams.c optional streams
-dev/sx/sx.c optional sx
-#dev/sx/sx_isa.c optional sx isa
-dev/sx/sx_util.c optional sx
-dev/sx/sx_pci.c optional sx pci
dev/sym/sym_hipd.c optional sym \
dependency "$S/dev/sym/sym_{conf,defs}.h"
dev/syscons/blank/blank_saver.c optional blank_saver
@@ -874,19 +1045,32 @@
dev/syscons/logo/logo.c optional logo_saver
dev/syscons/logo/logo_saver.c optional logo_saver
dev/syscons/rain/rain_saver.c optional rain_saver
+dev/syscons/schistory.c optional sc
+dev/syscons/scmouse.c optional sc
+dev/syscons/scterm-dumb.c optional sc
+dev/syscons/scterm.c optional sc
+dev/syscons/scvidctl.c optional sc
dev/syscons/snake/snake_saver.c optional snake_saver
dev/syscons/star/star_saver.c optional star_saver
+dev/syscons/syscons.c optional sc
+dev/syscons/sysmouse.c optional sc
dev/syscons/warp/warp_saver.c optional warp_saver
dev/tdfx/tdfx_linux.c optional tdfx_linux tdfx compat_linux
dev/tdfx/tdfx_pci.c optional tdfx pci
+dev/ti/if_ti.c optional ti pci
dev/trm/trm.c optional trm
-dev/twa/tw_cl_fwimg.c optional twa
-dev/twa/tw_cl_init.c optional twa
-dev/twa/tw_cl_intr.c optional twa
-dev/twa/tw_cl_io.c optional twa
-dev/twa/tw_cl_misc.c optional twa
-dev/twa/tw_osl_cam.c optional twa
-dev/twa/tw_osl_freebsd.c optional twa
+dev/twa/tw_cl_init.c optional twa \
+ compile-with "${NORMAL_C} -I$S/dev/twa"
+dev/twa/tw_cl_intr.c optional twa \
+ compile-with "${NORMAL_C} -I$S/dev/twa"
+dev/twa/tw_cl_io.c optional twa \
+ compile-with "${NORMAL_C} -I$S/dev/twa"
+dev/twa/tw_cl_misc.c optional twa \
+ compile-with "${NORMAL_C} -I$S/dev/twa"
+dev/twa/tw_osl_cam.c optional twa \
+ compile-with "${NORMAL_C} -I$S/dev/twa"
+dev/twa/tw_osl_freebsd.c optional twa \
+ compile-with "${NORMAL_C} -I$S/dev/twa"
dev/twe/twe.c optional twe
dev/twe/twe_freebsd.c optional twe
dev/tx/if_tx.c optional tx
@@ -898,11 +1082,14 @@
dev/uart/uart_bus_pccard.c optional uart pccard
dev/uart/uart_bus_pci.c optional uart pci
dev/uart/uart_bus_puc.c optional uart puc
+dev/uart/uart_bus_scc.c optional uart scc
dev/uart/uart_core.c optional uart
dev/uart/uart_dbg.c optional uart gdb
-dev/uart/uart_dev_ns8250.c optional uart
-dev/uart/uart_dev_sab82532.c optional uart
-dev/uart/uart_dev_z8530.c optional uart
+dev/uart/uart_dev_ns8250.c optional uart uart_ns8250
+dev/uart/uart_dev_sab82532.c optional uart uart_sab82532
+dev/uart/uart_dev_sab82532.c optional uart scc
+dev/uart/uart_dev_z8530.c optional uart uart_z8530
+dev/uart/uart_dev_z8530.c optional uart scc
dev/uart/uart_if.m optional uart
dev/uart/uart_subr.c optional uart
dev/uart/uart_tty.c optional uart
@@ -919,28 +1106,34 @@
dev/usb/if_kue.c optional kue
dev/usb/if_ural.c optional ural
dev/usb/if_rue.c optional rue
+dev/usb/if_rum.c optional rum
dev/usb/if_udav.c optional udav
dev/usb/ohci.c optional ohci
dev/usb/ohci_pci.c optional ohci pci
-dev/usb/ubsa.c optional ubsa ucom
+dev/usb/sl811hs.c optional slhci
+dev/usb/slhci_pccard.c optional slhci pccard
+dev/usb/uark.c optional uark
+dev/usb/ubsa.c optional ubsa
dev/usb/ubser.c optional ubser
dev/usb/ucom.c optional ucom
-dev/usb/ucycom.c optional ucycom ucom
+dev/usb/ucycom.c optional ucycom
dev/usb/udbp.c optional udbp
+dev/usb/ufoma.c optional ufoma
dev/usb/ufm.c optional ufm
-dev/usb/uftdi.c optional uftdi ucom
+dev/usb/uftdi.c optional uftdi
dev/usb/ugen.c optional ugen
dev/usb/uhci.c optional uhci
dev/usb/uhci_pci.c optional uhci pci
dev/usb/uhid.c optional uhid
dev/usb/uhub.c optional usb
+dev/usb/uipaq.c optional uipaq
dev/usb/ukbd.c optional ukbd
dev/usb/ulpt.c optional ulpt
dev/usb/umass.c optional umass
dev/usb/umct.c optional umct
dev/usb/umodem.c optional umodem
dev/usb/ums.c optional ums
-dev/usb/uplcom.c optional uplcom ucom
+dev/usb/uplcom.c optional uplcom
dev/usb/urio.c optional urio
dev/usb/usb.c optional usb
dev/usb/usb_ethersubr.c optional usb
@@ -951,8 +1144,8 @@
dev/usb/usbdi.c optional usb
dev/usb/usbdi_util.c optional usb
dev/usb/uscanner.c optional uscanner
-dev/usb/uvisor.c optional uvisor ucom
-dev/usb/uvscom.c optional uvscom ucom
+dev/usb/uvisor.c optional uvisor
+dev/usb/uvscom.c optional uvscom
dev/utopia/idtphy.c optional utopia
dev/utopia/suni.c optional utopia
dev/utopia/utopia.c optional utopia
@@ -969,6 +1162,13 @@
dev/wl/if_wl.c optional wl isa
dev/xe/if_xe.c optional xe
dev/xe/if_xe_pccard.c optional xe pccard
+fs/coda/coda_fbsd.c optional vcoda
+fs/coda/coda_namecache.c optional vcoda
+fs/coda/coda_psdev.c optional vcoda
+fs/coda/coda_subr.c optional vcoda
+fs/coda/coda_venus.c optional vcoda
+fs/coda/coda_vfsops.c optional vcoda
+fs/coda/coda_vnops.c optional vcoda
fs/deadfs/dead_vnops.c standard
fs/devfs/devfs_devs.c standard
fs/devfs/devfs_rule.c standard
@@ -977,10 +1177,15 @@
fs/fdescfs/fdesc_vfsops.c optional fdescfs
fs/fdescfs/fdesc_vnops.c optional fdescfs
fs/fifofs/fifo_vnops.c standard
+fs/hpfs/hpfs_alsubr.c optional hpfs
+fs/hpfs/hpfs_lookup.c optional hpfs
+fs/hpfs/hpfs_subr.c optional hpfs
+fs/hpfs/hpfs_vfsops.c optional hpfs
+fs/hpfs/hpfs_vnops.c optional hpfs
fs/msdosfs/msdosfs_conv.c optional msdosfs
fs/msdosfs/msdosfs_denode.c optional msdosfs
fs/msdosfs/msdosfs_fat.c optional msdosfs
-fs/msdosfs/msdosfs_fileno.c optional msdosfs_large
+fs/msdosfs/msdosfs_fileno.c optional msdosfs
fs/msdosfs/msdosfs_iconv.c optional msdosfs_iconv
fs/msdosfs/msdosfs_lookup.c optional msdosfs
fs/msdosfs/msdosfs_vfsops.c optional msdosfs
@@ -1028,38 +1233,40 @@
fs/udf/udf_iconv.c optional udf_iconv
fs/udf/udf_vfsops.c optional udf
fs/udf/udf_vnops.c optional udf
-fs/umapfs/umap_subr.c optional umapfs
-fs/umapfs/umap_vfsops.c optional umapfs
-fs/umapfs/umap_vnops.c optional umapfs
fs/unionfs/union_subr.c optional unionfs
fs/unionfs/union_vfsops.c optional unionfs
fs/unionfs/union_vnops.c optional unionfs
+fs/tmpfs/tmpfs_vnops.c optional tmpfs
+fs/tmpfs/tmpfs_fifoops.c optional tmpfs
+fs/tmpfs/tmpfs_vfsops.c optional tmpfs
+fs/tmpfs/tmpfs_subr.c optional tmpfs
+gdb/gdb_cons.c optional gdb
gdb/gdb_main.c optional gdb
gdb/gdb_packet.c optional gdb
geom/bde/g_bde.c optional geom_bde
geom/bde/g_bde_crypt.c optional geom_bde
geom/bde/g_bde_lock.c optional geom_bde
geom/bde/g_bde_work.c optional geom_bde
+geom/cache/g_cache.c optional geom_cache
geom/concat/g_concat.c optional geom_concat
geom/eli/g_eli.c optional geom_eli
geom/eli/g_eli_crypto.c optional geom_eli
geom/eli/g_eli_ctl.c optional geom_eli
+geom/eli/g_eli_integrity.c optional geom_eli
geom/eli/g_eli_key.c optional geom_eli
+geom/eli/g_eli_privacy.c optional geom_eli
geom/eli/pkcs5v2.c optional geom_eli
geom/gate/g_gate.c optional geom_gate
geom/geom_aes.c optional geom_aes
-geom/geom_apple.c optional geom_apple
geom/geom_bsd.c optional geom_bsd
geom/geom_bsd_enc.c optional geom_bsd
-geom/geom_ccd.c optional ccd
-geom/geom_ccd.c optional geom_ccd
+geom/geom_ccd.c optional ccd | geom_ccd
geom/geom_ctl.c standard
geom/geom_dev.c standard
geom/geom_disk.c standard
geom/geom_dump.c standard
geom/geom_event.c standard
geom/geom_fox.c optional geom_fox
-geom/geom_gpt.c optional geom_gpt
geom/geom_io.c standard
geom/geom_kern.c standard
geom/geom_mbr.c optional geom_mbr
@@ -1072,6 +1279,8 @@
geom/geom_sunlabel_enc.c optional geom_sunlabel
geom/geom_vfs.c standard
geom/geom_vol_ffs.c optional geom_vol
+geom/journal/g_journal.c optional geom_journal
+geom/journal/g_journal_ufs.c optional geom_journal
geom/label/g_label.c optional geom_label
geom/label/g_label_ext2fs.c optional geom_label
geom/label/g_label_iso9660.c optional geom_label
@@ -1081,12 +1290,21 @@
geom/label/g_label_ufs.c optional geom_label
geom/mirror/g_mirror.c optional geom_mirror
geom/mirror/g_mirror_ctl.c optional geom_mirror
+geom/multipath/g_multipath.c optional geom_multipath
geom/nop/g_nop.c optional geom_nop
+geom/part/g_part.c standard
+geom/part/g_part_if.m standard
+geom/part/g_part_apm.c optional geom_part_apm
+geom/part/g_part_gpt.c optional geom_part_gpt
+geom/part/g_part_mbr.c optional geom_part_mbr
geom/raid3/g_raid3.c optional geom_raid3
geom/raid3/g_raid3_ctl.c optional geom_raid3
geom/shsec/g_shsec.c optional geom_shsec
geom/stripe/g_stripe.c optional geom_stripe
geom/uzip/g_uzip.c optional geom_uzip
+geom/virstor/binstream.c optional geom_virstor
+geom/virstor/g_virstor.c optional geom_virstor
+geom/virstor/g_virstor_md.c optional geom_virstor
geom/zero/g_zero.c optional geom_zero
gnu/fs/ext2fs/ext2_alloc.c optional ext2fs \
warning "kernel contains GPL contaminated ext2fs filesystem"
@@ -1115,12 +1333,11 @@
i4b/driver/i4b_trace.c optional i4btrc
i4b/driver/i4b_rbch.c optional i4brbch
i4b/driver/i4b_tel.c optional i4btel
-i4b/driver/i4b_ipr.c optional i4bipr
-net/slcompress.c optional i4bipr
+#XXXBZ#i4b/driver/i4b_ipr.c optional i4bipr
+net/slcompress.c optional i4bipr | i4bisppp
i4b/driver/i4b_ctl.c optional i4bctl
-i4b/driver/i4b_ing.c optional i4bing
-i4b/driver/i4b_isppp.c optional i4bisppp
-net/slcompress.c optional i4bisppp
+#XXXBZ#i4b/driver/i4b_ing.c optional i4bing
+#XXXBZ#i4b/driver/i4b_isppp.c optional i4bisppp
#
# isdn4bsd CAPI driver
#
@@ -1171,16 +1388,16 @@
isa/isa_common.c optional isa
isa/isahint.c optional isa
isa/orm.c optional isa
-isa/pnp.c optional isa
-isa/pnpparse.c optional isa
-isofs/cd9660/cd9660_bmap.c optional cd9660
-isofs/cd9660/cd9660_lookup.c optional cd9660
-isofs/cd9660/cd9660_node.c optional cd9660
-isofs/cd9660/cd9660_rrip.c optional cd9660
-isofs/cd9660/cd9660_util.c optional cd9660
-isofs/cd9660/cd9660_vfsops.c optional cd9660
-isofs/cd9660/cd9660_vnops.c optional cd9660
-isofs/cd9660/cd9660_iconv.c optional cd9660_iconv
+isa/pnp.c optional isa isapnp
+isa/pnpparse.c optional isa isapnp
+fs/cd9660/cd9660_bmap.c optional cd9660
+fs/cd9660/cd9660_lookup.c optional cd9660
+fs/cd9660/cd9660_node.c optional cd9660
+fs/cd9660/cd9660_rrip.c optional cd9660
+fs/cd9660/cd9660_util.c optional cd9660
+fs/cd9660/cd9660_vfsops.c optional cd9660
+fs/cd9660/cd9660_vnops.c optional cd9660
+fs/cd9660/cd9660_iconv.c optional cd9660_iconv
kern/bus_if.m standard
kern/clock_if.m optional genclock
kern/cpufreq_if.m standard
@@ -1190,8 +1407,8 @@
kern/inflate.c optional gzip
kern/init_main.c standard
kern/init_sysent.c standard
+kern/ksched.c optional _kposix_priority_scheduling
kern/kern_acct.c standard
-kern/kern_acl.c standard
kern/kern_alq.c optional alq
kern/kern_clock.c standard
kern/kern_condvar.c standard
@@ -1214,7 +1431,6 @@
kern/kern_linker.c standard
kern/kern_lock.c standard
kern/kern_lockf.c standard
-kern/kern_mac.c standard
kern/kern_malloc.c standard
kern/kern_mbuf.c standard
kern/kern_mib.c standard
@@ -1225,9 +1441,11 @@
kern/kern_physio.c standard
kern/kern_pmc.c standard
kern/kern_poll.c optional device_polling
+kern/kern_priv.c standard
kern/kern_proc.c standard
kern/kern_prot.c standard
kern/kern_resource.c standard
+kern/kern_rwlock.c standard
kern/kern_sema.c standard
kern/kern_shutdown.c standard
kern/kern_sig.c standard
@@ -1248,19 +1466,25 @@
kern/linker_if.m standard
kern/md4c.c optional netsmb
kern/md5c.c standard
+kern/p1003_1b.c standard
+kern/posix4_mib.c standard
kern/sched_4bsd.c optional sched_4bsd
kern/sched_ule.c optional sched_ule
+kern/serdev_if.m standard
+kern/subr_acl_posix1e.c standard
kern/subr_autoconf.c standard
kern/subr_blist.c standard
kern/subr_bus.c standard
-kern/subr_clock.c optional genclock
+kern/subr_clock.c standard
kern/subr_devstat.c standard
kern/subr_disk.c standard
kern/subr_eventhandler.c standard
+kern/subr_fattime.c standard
kern/subr_firmware.c optional firmware
kern/subr_hints.c standard
kern/subr_kdb.c standard
kern/subr_kobj.c standard
+kern/subr_lock.c standard
kern/subr_log.c standard
kern/subr_mbpool.c optional libmbpool
kern/subr_mchain.c optional libmchain
@@ -1272,6 +1496,7 @@
kern/subr_prf.c standard
kern/subr_prof.c standard
kern/subr_rman.c standard
+kern/subr_rtc.c optional genclock
kern/subr_sbuf.c standard
kern/subr_scanf.c standard
kern/subr_sleepqueue.c standard
@@ -1286,35 +1511,39 @@
kern/sys_pipe.c standard
kern/sys_process.c standard
kern/sys_socket.c standard
-kern/syscalls.c optional witness
+kern/syscalls.c optional witness | invariants
kern/sysv_ipc.c standard
kern/sysv_msg.c optional sysvmsg
kern/sysv_sem.c optional sysvsem
kern/sysv_shm.c optional sysvshm
kern/tty.c standard
-kern/tty_compat.c standard
+kern/tty_compat.c optional compat_43tty
kern/tty_conf.c standard
kern/tty_cons.c standard
+#kern/tty_pts.c optional pty
kern/tty_pty.c optional pty
kern/tty_subr.c standard
kern/tty_tty.c standard
kern/uipc_accf.c optional inet
kern/uipc_cow.c optional zero_copy_sockets
+kern/uipc_debug.c optional ddb
kern/uipc_domain.c standard
kern/uipc_mbuf.c standard
kern/uipc_mbuf2.c standard
-kern/uipc_proto.c standard
+kern/uipc_mqueue.c optional p1003_1b_mqueue
kern/uipc_sem.c optional p1003_1b_semaphores
+kern/uipc_sockbuf.c standard
kern/uipc_socket.c standard
-kern/uipc_socket2.c standard
kern/uipc_syscalls.c standard
kern/uipc_usrreq.c standard
+kern/vfs_acl.c standard
kern/vfs_aio.c optional vfs_aio
kern/vfs_bio.c standard
kern/vfs_cache.c standard
kern/vfs_cluster.c standard
kern/vfs_default.c standard
kern/vfs_export.c standard
+kern/vfs_extattr.c standard
kern/vfs_hash.c standard
kern/vfs_init.c standard
kern/vfs_lookup.c standard
@@ -1360,75 +1589,82 @@
libkern/strncpy.c standard
libkern/strsep.c standard
libkern/strspn.c standard
+libkern/strstr.c standard
libkern/strtol.c standard
libkern/strtoq.c standard
libkern/strtoul.c standard
libkern/strtouq.c standard
libkern/strvalid.c standard
net/bpf.c standard
-net/bpf_filter.c optional bpf
-net/bpf_filter.c optional netgraph_bpf
-net/bridge.c optional bridge
-net/bridgestp.c optional if_bridge
+net/bpf_jitter.c optional bpf_jitter
+net/bpf_filter.c optional bpf | netgraph_bpf
+net/bridgestp.c optional bridge | if_bridge
net/bsd_comp.c optional ppp_bsdcomp
+net/ieee8023ad_lacp.c optional lagg
net/if.c standard
net/if_arcsubr.c optional arcnet
net/if_atmsubr.c optional atm
-net/if_bridge.c optional if_bridge
+net/if_bridge.c optional bridge | if_bridge
net/if_clone.c standard
net/if_disc.c optional disc
+net/if_edsc.c optional edsc
net/if_ef.c optional ef
-net/if_ethersubr.c optional ether
+net/if_enc.c optional enc
+net/if_ethersubr.c optional ether \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
net/if_faith.c optional faith
net/if_fddisubr.c optional fddi
net/if_fwsubr.c optional fwip
net/if_gif.c optional gif
net/if_gre.c optional gre
net/if_iso88025subr.c optional token
+net/if_lagg.c optional lagg
net/if_loop.c optional loop
net/if_media.c standard
net/if_mib.c standard
net/if_ppp.c optional ppp
net/if_sl.c optional sl
-net/if_spppfr.c optional sppp
-net/if_spppfr.c optional i4bisppp
-net/if_spppsubr.c optional sppp
-net/if_spppsubr.c optional i4bisppp
+net/if_spppfr.c optional i4bisppp | sppp | netgraph_sppp
+net/if_spppsubr.c optional i4bisppp | sppp | netgraph_sppp
net/if_stf.c optional stf
net/if_tun.c optional tun
net/if_tap.c optional tap
net/if_vlan.c optional vlan
+net/mppcc.c optional netgraph_mppc_compression
+net/mppcd.c optional netgraph_mppc_compression
net/netisr.c standard
net/ppp_deflate.c optional ppp_deflate
net/ppp_tty.c optional ppp
-net/pfil.c optional ether
-net/pfil.c optional inet
+net/pfil.c optional ether | inet
net/radix.c standard
net/raw_cb.c standard
net/raw_usrreq.c standard
net/route.c standard
net/rtsock.c standard
-net/slcompress.c optional netgraph_vjc
-net/slcompress.c optional ppp
-net/slcompress.c optional sl
-net/slcompress.c optional sppp
-net/zlib.c optional ppp_deflate
-net/zlib.c optional ipsec
-net/zlib.c optional crypto
-net/zlib.c optional geom_uzip
+net/slcompress.c optional netgraph_vjc | ppp | sl | sppp | \
+ netgraph_sppp
+net/zlib.c optional crypto | geom_uzip | ipsec | \
+ mxge | ppp_deflate | netgraph_deflate
net80211/ieee80211.c optional wlan
net80211/ieee80211_acl.c optional wlan_acl
+net80211/ieee80211_amrr.c optional wlan_amrr
net80211/ieee80211_crypto.c optional wlan
net80211/ieee80211_crypto_ccmp.c optional wlan_ccmp
net80211/ieee80211_crypto_none.c optional wlan
net80211/ieee80211_crypto_tkip.c optional wlan_tkip
net80211/ieee80211_crypto_wep.c optional wlan_wep
net80211/ieee80211_freebsd.c optional wlan
+net80211/ieee80211_ht.c optional wlan
net80211/ieee80211_input.c optional wlan
net80211/ieee80211_ioctl.c optional wlan
net80211/ieee80211_node.c optional wlan
net80211/ieee80211_output.c optional wlan
+net80211/ieee80211_power.c optional wlan
net80211/ieee80211_proto.c optional wlan
+net80211/ieee80211_regdomain.c optional wlan
+net80211/ieee80211_scan.c optional wlan
+net80211/ieee80211_scan_ap.c optional wlan_scan_ap
+net80211/ieee80211_scan_sta.c optional wlan_scan_sta
net80211/ieee80211_xauth.c optional wlan_xauth
netatalk/aarp.c optional netatalk
netatalk/at_control.c optional netatalk
@@ -1438,94 +1674,103 @@
netatalk/ddp_output.c optional netatalk
netatalk/ddp_pcb.c optional netatalk
netatalk/ddp_usrreq.c optional netatalk
-netatm/atm_aal5.c optional atm_core
-netatm/atm_cm.c optional atm_core
-netatm/atm_device.c optional atm_core
-netatm/atm_if.c optional atm_core
-netatm/atm_proto.c optional atm_core
-netatm/atm_signal.c optional atm_core
-netatm/atm_socket.c optional atm_core
-netatm/atm_subr.c optional atm_core
-netatm/atm_usrreq.c optional atm_core
-netatm/ipatm/ipatm_event.c optional atm_ip atm_core
-netatm/ipatm/ipatm_if.c optional atm_ip atm_core
-netatm/ipatm/ipatm_input.c optional atm_ip atm_core
-netatm/ipatm/ipatm_load.c optional atm_ip atm_core
-netatm/ipatm/ipatm_output.c optional atm_ip atm_core
-netatm/ipatm/ipatm_usrreq.c optional atm_ip atm_core
-netatm/ipatm/ipatm_vcm.c optional atm_ip atm_core
-netatm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core
-netatm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core
-netatm/spans/spans_arp.c optional atm_spans atm_core \
- dependency "spans_xdr.h"
-netatm/spans/spans_cls.c optional atm_spans atm_core
-netatm/spans/spans_if.c optional atm_spans atm_core
-netatm/spans/spans_kxdr.c optional atm_spans atm_core
-netatm/spans/spans_msg.c optional atm_spans atm_core
-netatm/spans/spans_print.c optional atm_spans atm_core
-netatm/spans/spans_proto.c optional atm_spans atm_core
-netatm/spans/spans_subr.c optional atm_spans atm_core
-netatm/spans/spans_util.c optional atm_spans atm_core
-spans_xdr.h optional atm_spans atm_core \
- before-depend \
- dependency "$S/netatm/spans/spans_xdr.x" \
- compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \
- clean "spans_xdr.h" \
- no-obj no-implicit-rule
-spans_xdr.c optional atm_spans atm_core \
- before-depend \
- dependency "$S/netatm/spans/spans_xdr.x" \
- compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \
- clean "spans_xdr.c" \
- no-obj no-implicit-rule local
-spans_xdr.o optional atm_spans atm_core \
- dependency "$S/netatm/spans/spans_xdr.x" \
- compile-with "${NORMAL_C}" \
- no-implicit-rule local
-netatm/uni/q2110_sigaa.c optional atm_uni atm_core
-netatm/uni/q2110_sigcpcs.c optional atm_uni atm_core
-netatm/uni/q2110_subr.c optional atm_uni atm_core
-netatm/uni/qsaal1_sigaa.c optional atm_uni atm_core
-netatm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core
-netatm/uni/qsaal1_subr.c optional atm_uni atm_core
-netatm/uni/sscf_uni.c optional atm_uni atm_core
-netatm/uni/sscf_uni_lower.c optional atm_uni atm_core
-netatm/uni/sscf_uni_upper.c optional atm_uni atm_core
-netatm/uni/sscop.c optional atm_uni atm_core
-netatm/uni/sscop_lower.c optional atm_uni atm_core
-netatm/uni/sscop_pdu.c optional atm_uni atm_core
-netatm/uni/sscop_sigaa.c optional atm_uni atm_core
-netatm/uni/sscop_sigcpcs.c optional atm_uni atm_core
-netatm/uni/sscop_subr.c optional atm_uni atm_core
-netatm/uni/sscop_timer.c optional atm_uni atm_core
-netatm/uni/sscop_upper.c optional atm_uni atm_core
-netatm/uni/uni_load.c optional atm_uni atm_core
-netatm/uni/uniarp.c optional atm_uni atm_core
-netatm/uni/uniarp_cache.c optional atm_uni atm_core
-netatm/uni/uniarp_input.c optional atm_uni atm_core
-netatm/uni/uniarp_output.c optional atm_uni atm_core
-netatm/uni/uniarp_timer.c optional atm_uni atm_core
-netatm/uni/uniarp_vcm.c optional atm_uni atm_core
-netatm/uni/uniip.c optional atm_uni atm_core
-netatm/uni/unisig_decode.c optional atm_uni atm_core
-netatm/uni/unisig_encode.c optional atm_uni atm_core
-netatm/uni/unisig_if.c optional atm_uni atm_core
-netatm/uni/unisig_mbuf.c optional atm_uni atm_core
-netatm/uni/unisig_msg.c optional atm_uni atm_core
-netatm/uni/unisig_print.c optional atm_uni atm_core
-netatm/uni/unisig_proto.c optional atm_uni atm_core
-netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core
-netatm/uni/unisig_subr.c optional atm_uni atm_core
-netatm/uni/unisig_util.c optional atm_uni atm_core
-netatm/uni/unisig_vc_state.c optional atm_uni atm_core
-netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif
-netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif
-netgraph/atm/ccatm/ng_ccatm.c optional ngatm_ccatm
+#
+# netatm has been disconnected from the build until it is MPSAFE, or
+# alternatively, until it is removed.
+#
+#netatm/atm_aal5.c optional atm_core
+#netatm/atm_cm.c optional atm_core
+#netatm/atm_device.c optional atm_core
+#netatm/atm_if.c optional atm_core
+#netatm/atm_proto.c optional atm_core
+#netatm/atm_signal.c optional atm_core
+#netatm/atm_socket.c optional atm_core
+#netatm/atm_subr.c optional atm_core
+#netatm/atm_usrreq.c optional atm_core
+#netatm/ipatm/ipatm_event.c optional atm_ip atm_core
+#netatm/ipatm/ipatm_if.c optional atm_ip atm_core
+#netatm/ipatm/ipatm_input.c optional atm_ip atm_core
+#netatm/ipatm/ipatm_load.c optional atm_ip atm_core
+#netatm/ipatm/ipatm_output.c optional atm_ip atm_core
+#netatm/ipatm/ipatm_usrreq.c optional atm_ip atm_core
+#netatm/ipatm/ipatm_vcm.c optional atm_ip atm_core
+#netatm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core
+#netatm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core
+#netatm/spans/spans_arp.c optional atm_spans atm_core \
+# dependency "spans_xdr.h"
+#netatm/spans/spans_cls.c optional atm_spans atm_core
+#netatm/spans/spans_if.c optional atm_spans atm_core
+#netatm/spans/spans_kxdr.c optional atm_spans atm_core
+#netatm/spans/spans_msg.c optional atm_spans atm_core
+#netatm/spans/spans_print.c optional atm_spans atm_core
+#netatm/spans/spans_proto.c optional atm_spans atm_core
+#netatm/spans/spans_subr.c optional atm_spans atm_core
+#netatm/spans/spans_util.c optional atm_spans atm_core
+#spans_xdr.h optional atm_spans atm_core \
+# before-depend \
+# dependency "$S/netatm/spans/spans_xdr.x" \
+# compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \
+# clean "spans_xdr.h" \
+# no-obj no-implicit-rule
+#spans_xdr.c optional atm_spans atm_core \
+# before-depend \
+# dependency "$S/netatm/spans/spans_xdr.x" \
+# compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \
+# clean "spans_xdr.c" \
+# no-obj no-implicit-rule local
+#spans_xdr.o optional atm_spans atm_core \
+# dependency "$S/netatm/spans/spans_xdr.x" \
+# compile-with "${NORMAL_C}" \
+# no-implicit-rule local
+#netatm/uni/q2110_sigaa.c optional atm_uni atm_core
+#netatm/uni/q2110_sigcpcs.c optional atm_uni atm_core
+#netatm/uni/q2110_subr.c optional atm_uni atm_core
+#netatm/uni/qsaal1_sigaa.c optional atm_uni atm_core
+#netatm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core
+#netatm/uni/qsaal1_subr.c optional atm_uni atm_core
+#netatm/uni/sscf_uni.c optional atm_uni atm_core
+#netatm/uni/sscf_uni_lower.c optional atm_uni atm_core
+#netatm/uni/sscf_uni_upper.c optional atm_uni atm_core
+#netatm/uni/sscop.c optional atm_uni atm_core
+#netatm/uni/sscop_lower.c optional atm_uni atm_core
+#netatm/uni/sscop_pdu.c optional atm_uni atm_core
+#netatm/uni/sscop_sigaa.c optional atm_uni atm_core
+#netatm/uni/sscop_sigcpcs.c optional atm_uni atm_core
+#netatm/uni/sscop_subr.c optional atm_uni atm_core
+#netatm/uni/sscop_timer.c optional atm_uni atm_core
+#netatm/uni/sscop_upper.c optional atm_uni atm_core
+#netatm/uni/uni_load.c optional atm_uni atm_core
+#netatm/uni/uniarp.c optional atm_uni atm_core
+#netatm/uni/uniarp_cache.c optional atm_uni atm_core
+#netatm/uni/uniarp_input.c optional atm_uni atm_core
+#netatm/uni/uniarp_output.c optional atm_uni atm_core
+#netatm/uni/uniarp_timer.c optional atm_uni atm_core
+#netatm/uni/uniarp_vcm.c optional atm_uni atm_core
+#netatm/uni/uniip.c optional atm_uni atm_core
+#netatm/uni/unisig_decode.c optional atm_uni atm_core
+#netatm/uni/unisig_encode.c optional atm_uni atm_core
+#netatm/uni/unisig_if.c optional atm_uni atm_core
+#netatm/uni/unisig_mbuf.c optional atm_uni atm_core
+#netatm/uni/unisig_msg.c optional atm_uni atm_core
+#netatm/uni/unisig_print.c optional atm_uni atm_core
+#netatm/uni/unisig_proto.c optional atm_uni atm_core
+#netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core
+#netatm/uni/unisig_subr.c optional atm_uni atm_core
+#netatm/uni/unisig_util.c optional atm_uni atm_core
+#netatm/uni/unisig_vc_state.c optional atm_uni atm_core
+#netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif
+#netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif
+netgraph/atm/ccatm/ng_ccatm.c optional ngatm_ccatm \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
netgraph/atm/ng_atm.c optional ngatm_atm
-netgraph/atm/ngatmbase.c optional ngatm_atmbase
-netgraph/atm/sscfu/ng_sscfu.c optional ngatm_sscfu
-netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop
-netgraph/atm/uni/ng_uni.c optional ngatm_uni
+netgraph/atm/ngatmbase.c optional ngatm_atmbase \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+netgraph/atm/sscfu/ng_sscfu.c optional ngatm_sscfu \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+netgraph/atm/sscop/ng_sscop.c optional ngatm_sscop \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
+netgraph/atm/uni/ng_uni.c optional ngatm_uni \
+ compile-with "${NORMAL_C} -I$S/contrib/ngatm"
netgraph/bluetooth/common/ng_bluetooth.c optional netgraph_bluetooth
netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c optional netgraph_bluetooth_bt3c
netgraph/bluetooth/drivers/h4/ng_h4.c optional netgraph_bluetooth_h4
@@ -1555,7 +1800,9 @@
netgraph/ng_base.c optional netgraph
netgraph/ng_bpf.c optional netgraph_bpf
netgraph/ng_bridge.c optional netgraph_bridge
+netgraph/ng_car.c optional netgraph_car
netgraph/ng_cisco.c optional netgraph_cisco
+netgraph/ng_deflate.c optional netgraph_deflate
netgraph/ng_device.c optional netgraph_device
netgraph/ng_echo.c optional netgraph_echo
netgraph/ng_eiface.c optional netgraph_eiface
@@ -1571,18 +1818,20 @@
netgraph/ng_ksocket.c optional netgraph_ksocket
netgraph/ng_l2tp.c optional netgraph_l2tp
netgraph/ng_lmi.c optional netgraph_lmi
-netgraph/ng_mppc.c optional netgraph_mppc_compression
-netgraph/ng_mppc.c optional netgraph_mppc_encryption
+netgraph/ng_mppc.c optional netgraph_mppc_compression | \
+ netgraph_mppc_encryption
netgraph/ng_nat.c optional netgraph_nat
netgraph/ng_one2many.c optional netgraph_one2many
netgraph/ng_parse.c optional netgraph
netgraph/ng_ppp.c optional netgraph_ppp
netgraph/ng_pppoe.c optional netgraph_pppoe
netgraph/ng_pptpgre.c optional netgraph_pptpgre
+netgraph/ng_pred1.c optional netgraph_pred1
netgraph/ng_rfc1490.c optional netgraph_rfc1490
netgraph/ng_socket.c optional netgraph_socket
netgraph/ng_split.c optional netgraph_split
netgraph/ng_sppp.c optional netgraph_sppp
+netgraph/ng_tag.c optional netgraph_tag
netgraph/ng_tcpmss.c optional netgraph_tcpmss
netgraph/ng_tee.c optional netgraph_tee
netgraph/ng_tty.c optional netgraph_tty
@@ -1597,54 +1846,58 @@
netinet/in_gif.c optional gif inet
netinet/ip_gre.c optional gre inet
netinet/ip_id.c optional inet
+netinet/in_mcast.c optional inet
netinet/in_pcb.c optional inet
-netinet/in_proto.c optional inet
+netinet/in_proto.c optional inet \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
netinet/in_rmx.c optional inet
netinet/ip_divert.c optional ipdivert
netinet/ip_dummynet.c optional dummynet
-netinet/ip_ecn.c optional inet
-netinet/ip_ecn.c optional inet6
-netinet/ip_encap.c optional inet
-netinet/ip_encap.c optional inet6
+netinet/ip_ecn.c optional inet | inet6
+netinet/ip_encap.c optional inet | inet6
netinet/ip_fastfwd.c optional inet
-netinet/ip_fw2.c optional ipfirewall
+netinet/ip_fw2.c optional ipfirewall \
+ compile-with "${NORMAL_C} -I$S/contrib/pf"
netinet/ip_fw_pfil.c optional ipfirewall
netinet/ip_icmp.c optional inet
netinet/ip_input.c optional inet
-netinet/ip_mroute.c optional mrouting
+netinet/ip_ipsec.c optional ipsec
+netinet/ip_mroute.c optional mrouting inet | mrouting inet6
+netinet/ip_options.c optional inet
netinet/ip_output.c optional inet
netinet/raw_ip.c optional inet
+netinet/sctp_asconf.c optional inet inet6 sctp
+netinet/sctp_auth.c optional inet inet6 sctp
+netinet/sctp_bsd_addr.c optional inet inet6 sctp
+netinet/sctp_cc_functions.c optional inet inet6 sctp
+netinet/sctp_crc32.c optional inet inet6 sctp
+netinet/sctp_indata.c optional inet inet6 sctp
+netinet/sctp_input.c optional inet inet6 sctp
+netinet/sctp_output.c optional inet inet6 sctp
+netinet/sctp_pcb.c optional inet inet6 sctp
+netinet/sctp_peeloff.c optional inet inet6 sctp
+netinet/sctp_sysctl.c optional inet inet6 sctp
+netinet/sctp_timer.c optional inet inet6 sctp
+netinet/sctp_usrreq.c optional inet inet6 sctp
+netinet/sctputil.c optional inet inet6 sctp
netinet/tcp_debug.c optional tcpdebug
netinet/tcp_hostcache.c optional inet
netinet/tcp_input.c optional inet
netinet/tcp_output.c optional inet
+netinet/tcp_reass.c optional inet
netinet/tcp_sack.c optional inet
netinet/tcp_subr.c optional inet
netinet/tcp_syncache.c optional inet
netinet/tcp_timer.c optional inet
+netinet/tcp_timewait.c optional inet
netinet/tcp_usrreq.c optional inet
netinet/udp_usrreq.c optional inet
-netinet/libalias/alias.c optional libalias
-netinet/libalias/alias_cuseeme.c optional libalias
-netinet/libalias/alias_db.c optional libalias
-netinet/libalias/alias_ftp.c optional libalias
-netinet/libalias/alias_irc.c optional libalias
-netinet/libalias/alias_nbt.c optional libalias
-netinet/libalias/alias_pptp.c optional libalias
-netinet/libalias/alias_proxy.c optional libalias
-netinet/libalias/alias_skinny.c optional libalias
-netinet/libalias/alias_smedia.c optional libalias
-netinet/libalias/alias_util.c optional libalias
-netinet6/ah_aesxcbcmac.c optional ipsec
-netinet6/ah_core.c optional ipsec
-netinet6/ah_input.c optional ipsec
-netinet6/ah_output.c optional ipsec
+netinet/libalias/alias.c optional libalias | netgraph_nat
+netinet/libalias/alias_db.c optional libalias | netgraph_nat
+netinet/libalias/alias_mod.c optional libalias | netgraph_nat
+netinet/libalias/alias_proxy.c optional libalias | netgraph_nat
+netinet/libalias/alias_util.c optional libalias | netgraph_nat
netinet6/dest6.c optional inet6
-netinet6/esp_aesctr.c optional ipsec ipsec_esp
-netinet6/esp_core.c optional ipsec ipsec_esp
-netinet6/esp_input.c optional ipsec ipsec_esp
-netinet6/esp_output.c optional ipsec ipsec_esp
-netinet6/esp_rijndael.c optional ipsec ipsec_esp
netinet6/frag6.c optional inet6
netinet6/icmp6.c optional inet6
netinet6/in6.c optional inet6
@@ -1656,15 +1909,11 @@
netinet6/in6_rmx.c optional inet6
netinet6/in6_src.c optional inet6
netinet6/ip6_forward.c optional inet6
-netinet6/ip6_fw.c optional inet6 ipv6firewall
netinet6/ip6_id.c optional inet6
netinet6/ip6_input.c optional inet6
-netinet6/ip6_mroute.c optional inet6
+netinet6/ip6_mroute.c optional mrouting inet6
netinet6/ip6_output.c optional inet6
-netinet6/ipcomp_core.c optional ipsec
-netinet6/ipcomp_input.c optional ipsec
-netinet6/ipcomp_output.c optional ipsec
-netinet6/ipsec.c optional ipsec
+netinet6/ip6_ipsec.c optional inet6 ipsec
netinet6/mld6.c optional inet6
netinet6/nd6.c optional inet6
netinet6/nd6_nbr.c optional inet6
@@ -1672,34 +1921,29 @@
netinet6/raw_ip6.c optional inet6
netinet6/route6.c optional inet6
netinet6/scope6.c optional inet6
-netinet6/udp6_output.c optional inet6
+netinet6/sctp6_usrreq.c optional inet6 sctp
netinet6/udp6_usrreq.c optional inet6
-netipsec/ipsec.c optional fast_ipsec
-netipsec/ipsec_input.c optional fast_ipsec
-netipsec/ipsec_mbuf.c optional fast_ipsec
-netipsec/ipsec_output.c optional fast_ipsec
-netipsec/key.c optional fast_ipsec
-netipsec/key_debug.c optional fast_ipsec
-netipsec/keysock.c optional fast_ipsec
-netipsec/xform_ah.c optional fast_ipsec
-netipsec/xform_esp.c optional fast_ipsec
-netipsec/xform_ipcomp.c optional fast_ipsec
-netipsec/xform_ipip.c optional fast_ipsec
-netipsec/xform_tcp.c optional fast_ipsec tcp_signature
+netipsec/ipsec.c optional ipsec
+netipsec/ipsec_input.c optional ipsec
+netipsec/ipsec_mbuf.c optional ipsec
+netipsec/ipsec_output.c optional ipsec
+netipsec/key.c optional ipsec
+netipsec/key_debug.c optional ipsec
+netipsec/keysock.c optional ipsec
+netipsec/xform_ah.c optional ipsec
+netipsec/xform_esp.c optional ipsec
+netipsec/xform_ipcomp.c optional ipsec
+netipsec/xform_ipip.c optional ipsec
+netipsec/xform_tcp.c optional ipsec tcp_signature
netipx/ipx.c optional ipx
netipx/ipx_cksum.c optional ipx
netipx/ipx_input.c optional ipx
-netipx/ipx_ip.c optional ipx
netipx/ipx_outputfl.c optional ipx
netipx/ipx_pcb.c optional ipx
netipx/ipx_proto.c optional ipx
netipx/ipx_usrreq.c optional ipx
netipx/spx_debug.c optional ipx
netipx/spx_usrreq.c optional ipx
-netkey/key.c optional ipsec
-netkey/key_debug.c optional ipsec
-netkey/keydb.c optional ipsec
-netkey/keysock.c optional ipsec
netnatm/natm.c optional natm
netnatm/natm_pcb.c optional natm
netnatm/natm_proto.c optional natm
@@ -1721,8 +1965,7 @@
netsmb/smb_subr.c optional netsmb
netsmb/smb_trantcp.c optional netsmb
netsmb/smb_usr.c optional netsmb
-nfs/nfs_common.c optional nfsclient
-nfs/nfs_common.c optional nfsserver
+nfs/nfs_common.c optional nfsclient | nfsserver
nfs4client/nfs4_dev.c optional nfsclient
nfs4client/nfs4_idmap.c optional nfsclient
nfs4client/nfs4_socket.c optional nfsclient
@@ -1748,52 +1991,57 @@
nfsserver/nfs_srvsubs.c optional nfsserver
nfsserver/nfs_syscalls.c optional nfsserver
# crypto support
-opencrypto/cast.c optional crypto
-opencrypto/cast.c optional ipsec ipsec_esp
+opencrypto/cast.c optional crypto | ipsec
opencrypto/criov.c optional crypto
opencrypto/crypto.c optional crypto
opencrypto/cryptodev.c optional cryptodev
+opencrypto/cryptodev_if.m optional crypto
opencrypto/cryptosoft.c optional crypto
opencrypto/deflate.c optional crypto
-opencrypto/rmd160.c optional crypto
-opencrypto/rmd160.c optional ipsec
+opencrypto/rmd160.c optional crypto | ipsec
opencrypto/skipjack.c optional crypto
opencrypto/xform.c optional crypto
pci/agp.c optional agp pci
pci/agp_if.m optional agp pci
pci/alpm.c optional alpm pci
-pci/amdpm.c optional amdpm pci
-pci/amdpm.c optional nfpm pci
-pci/if_dc.c optional dc pci
-pci/if_de.c optional de pci
+pci/amdpm.c optional amdpm pci | nfpm pci
+pci/amdsmb.c optional amdsmb pci
pci/if_mn.c optional mn pci
pci/if_pcn.c optional pcn pci
pci/if_rl.c optional rl pci
pci/if_sf.c optional sf pci
pci/if_sis.c optional sis pci
-pci/if_sk.c optional sk pci
pci/if_ste.c optional ste pci
-pci/if_ti.c optional ti pci
pci/if_tl.c optional tl pci
pci/if_vr.c optional vr pci
pci/if_wb.c optional wb pci
pci/if_xl.c optional xl pci
pci/intpm.c optional intpm pci
pci/ncr.c optional ncr pci
+pci/nfsmb.c optional nfsmb pci
pci/viapm.c optional viapm pci
pci/xrpu.c optional xrpu pci
-posix4/ksched.c optional _kposix_priority_scheduling
-posix4/p1003_1b.c standard
-posix4/posix4_mib.c standard
rpc/rpcclnt.c optional nfsclient
+security/audit/audit.c optional audit
+security/audit/audit_arg.c optional audit
+security/audit/audit_bsm.c optional audit
+security/audit/audit_bsm_klib.c optional audit
+security/audit/audit_bsm_token.c optional audit
+security/audit/audit_pipe.c optional audit
security/audit/audit_syscalls.c standard
+security/audit/audit_trigger.c optional audit
+security/audit/audit_worker.c optional audit
+security/mac/mac_audit.c optional mac audit
+security/mac/mac_framework.c optional mac
security/mac/mac_inet.c optional mac inet
security/mac/mac_label.c optional mac
security/mac/mac_net.c optional mac
security/mac/mac_pipe.c optional mac
security/mac/mac_posix_sem.c optional mac
+security/mac/mac_priv.c optional mac
security/mac/mac_process.c optional mac
security/mac/mac_socket.c optional mac
+security/mac/mac_syscalls.c standard
security/mac/mac_system.c optional mac
security/mac/mac_sysv_msg.c optional mac
security/mac/mac_sysv_sem.c optional mac
@@ -1824,6 +2072,7 @@
ufs/ufs/ufs_bmap.c optional ffs
ufs/ufs/ufs_dirhash.c optional ffs
ufs/ufs/ufs_extattr.c optional ffs
+ufs/ufs/ufs_gjournal.c optional ffs
ufs/ufs/ufs_inode.c optional ffs
ufs/ufs/ufs_lookup.c optional ffs
ufs/ufs/ufs_quota.c optional ffs
@@ -1832,6 +2081,7 @@
vm/default_pager.c standard
vm/device_pager.c standard
vm/phys_pager.c standard
+vm/redzone.c optional DEBUG_REDZONE
vm/swap_pager.c standard
vm/uma_core.c standard
vm/uma_dbg.c standard
@@ -1849,6 +2099,143 @@
vm/vm_pageout.c standard
vm/vm_pageq.c standard
vm/vm_pager.c standard
+vm/vm_phys.c standard
vm/vm_unix.c standard
vm/vm_zeroidle.c standard
vm/vnode_pager.c standard
+#
+gnu/fs/xfs/xfs_alloc.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \
+ warning "kernel contains GPL contaminated xfs filesystem"
+gnu/fs/xfs/xfs_alloc_btree.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_bit.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_bmap.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_bmap_btree.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_btree.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_buf_item.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_da_btree.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_dir.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_dir2.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_dir2_block.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_dir2_data.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_dir2_leaf.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_dir2_node.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_dir2_sf.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_dir2_trace.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_dir_leaf.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_error.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_extfree_item.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_fsops.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_ialloc.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_ialloc_btree.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_inode.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_inode_item.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_iocore.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_itable.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_dfrag.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_log.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_log_recover.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_mount.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_rename.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_trans.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_trans_ail.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_trans_buf.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_trans_extfree.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_trans_inode.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_trans_item.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_utils.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_vfsops.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_vnodeops.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_rw.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_attr_leaf.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_attr.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_dmops.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_qmops.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_iget.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_mountops.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_vnops.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_frw.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_buf.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_globals.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_dmistubs.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_super.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_stats.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_vfs.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_vnode.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_sysctl.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_fs_subr.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/xfs_ioctl.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/support/debug.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/support/ktrace.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/support/mrlock.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/support/uuid.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/FreeBSD/support/kmem.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_iomap.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+gnu/fs/xfs/xfs_behavior.c optional xfs \
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
Index: files.sparc64
===================================================================
RCS file: /home/cvs/src/sys/conf/files.sparc64,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L sys/conf/files.sparc64 -L sys/conf/files.sparc64 -u -r1.1.1.2 -r1.2
--- sys/conf/files.sparc64
+++ sys/conf/files.sparc64
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sparc64,v 1.73.2.1 2006/02/13 11:39:01 marius Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.92 2007/07/03 12:13:42 gnn Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -12,17 +12,28 @@
no-obj no-implicit-rule before-depend \
clean "atkbdmap.h"
#
+sunkbdmap.h optional sunkbd_dflt_keymap \
+ compile-with "/usr/sbin/kbdcontrol -L ${SUNKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > sunkbdmap.h" \
+ no-obj no-implicit-rule before-depend \
+ clean "sunkbdmap.h"
+#
ukbdmap.h optional ukbd_dflt_keymap \
compile-with "/usr/sbin/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"
#
+hal.o optional ath_hal \
+ dependency "$S/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu" \
+ compile-with "uudecode < $S/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu" \
+ no-implicit-rule
+opt_ah.h optional ath_hal \
+ dependency "$S/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h" \
+ compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h opt_ah.h" \
+ no-obj no-implicit-rule before-depend \
+ clean "opt_ah.h"
#
-crypto/blowfish/bf_enc.c optional crypto
-crypto/blowfish/bf_enc.c optional ipsec ipsec_esp
-crypto/des/des_enc.c optional crypto
-crypto/des/des_enc.c optional ipsec ipsec_esp
-crypto/des/des_enc.c optional netsmbcrypto
+crypto/blowfish/bf_enc.c optional crypto | ipsec
+crypto/des/des_enc.c optional crypto | ipsec | netsmb
dev/atkbdc/atkbd.c optional atkbd atkbdc
dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc
dev/atkbdc/atkbdc.c optional atkbdc
@@ -30,59 +41,45 @@
dev/atkbdc/atkbdc_isa.c optional atkbdc isa
dev/atkbdc/atkbdc_subr.c optional atkbdc
dev/atkbdc/psm.c optional psm atkbdc
-dev/auxio/auxio.c optional auxio sbus
-dev/auxio/auxio.c optional auxio ebus
+dev/auxio/auxio.c optional auxio sbus | auxio ebus
dev/esp/esp_sbus.c optional esp sbus
dev/fb/creator.c optional creator sc
dev/fb/fb.c optional sc
+dev/fb/gallant12x22.c optional sc
dev/fb/machfb.c optional machfb sc
-dev/fb/splash.c optional splash
dev/hwpmc/hwpmc_sparc64.c optional hwpmc
-dev/kbd/kbd.c optional atkbd
-dev/kbd/kbd.c optional sc
-dev/kbd/kbd.c optional ukbd
+dev/kbd/kbd.c optional atkbd | sc | ukbd
+dev/le/if_le_lebuffer.c optional le sbus
dev/le/if_le_ledma.c optional le sbus
+dev/le/lebuffer_sbus.c optional le sbus
dev/ofw/ofw_bus_if.m standard
+dev/ofw/ofw_bus_subr.c standard
dev/ofw/ofw_console.c optional ofw_console
dev/ofw/openfirm.c standard
dev/ofw/openfirmio.c standard
dev/ofw/openpromio.c standard
-dev/sound/sbus/cs4231.c optional snd_audiocs ebus
-dev/sound/sbus/cs4231.c optional snd_audiocs sbus
+dev/pcf/envctrl.c optional pcf ebus
+dev/pcf/pcf_ebus.c optional pcf ebus
+dev/sound/sbus/cs4231.c optional snd_audiocs ebus | \
+ snd_audiocs sbus
dev/syscons/scgfbrndr.c optional sc
-dev/syscons/schistory.c optional sc
-dev/syscons/scmouse.c optional sc
-dev/syscons/scterm.c optional sc
-dev/syscons/scterm-dumb.c optional sc
dev/syscons/scterm-sc.c optional sc
-dev/syscons/scvidctl.c optional sc
dev/syscons/scvtb.c optional sc
-dev/syscons/syscons.c optional sc
-dev/syscons/sysmouse.c optional sc
dev/uart/uart_cpu_sparc64.c optional uart
dev/uart/uart_kbd_sun.c optional uart sc
-geom/geom_bsd.c standard
-geom/geom_bsd_enc.c standard
-geom/geom_sunlabel.c standard
-geom/geom_sunlabel_enc.c standard
kern/syscalls.c optional ktr
libkern/ffs.c standard
libkern/ffsl.c standard
libkern/fls.c standard
libkern/flsl.c standard
sparc64/central/central.c optional central
-sparc64/creator/creator_upa.c optional creator sc
sparc64/ebus/ebus.c optional ebus
sparc64/fhc/clkbrd.c optional clkbrd fhc
sparc64/fhc/fhc.c optional fhc
-sparc64/fhc/fhc_central.c optional fhc central
-sparc64/fhc/fhc_nexus.c optional fhc
sparc64/isa/isa.c optional isa
sparc64/isa/isa_dma.c optional isa
-sparc64/isa/ofw_isa.c optional ebus
-sparc64/isa/ofw_isa.c optional isa
+sparc64/isa/ofw_isa.c optional ebus | isa
sparc64/pci/apb.c optional pci
-sparc64/pci/ofw_pci.c optional pci
sparc64/pci/ofw_pcib.c optional pci
sparc64/pci/ofw_pcib_subr.c optional pci
sparc64/pci/ofw_pcibus.c optional pci
@@ -104,9 +101,8 @@
sparc64/sparc64/dump_machdep.c standard
sparc64/sparc64/elf_machdep.c standard
sparc64/sparc64/exception.S standard no-obj
-sparc64/sparc64/eeprom.c optional eeprom ebus
-sparc64/sparc64/eeprom.c optional eeprom fhc
-sparc64/sparc64/eeprom.c optional eeprom sbus
+sparc64/sparc64/eeprom.c optional eeprom ebus | eeprom fhc | \
+ eeprom sbus
sparc64/sparc64/gdb_machdep.c optional gdb
sparc64/sparc64/identcpu.c standard
sparc64/sparc64/in_cksum.c optional inet
@@ -124,8 +120,7 @@
sparc64/sparc64/ofw_machdep.c standard
sparc64/sparc64/pmap.c standard
sparc64/sparc64/prof_machdep.c optional profiling-routine
-sparc64/sparc64/rtc.c optional rtc ebus
-sparc64/sparc64/rtc.c optional rtc isa
+sparc64/sparc64/rtc.c optional rtc ebus | rtc isa
sparc64/sparc64/rwindow.c standard
sparc64/sparc64/sc_machdep.c optional sc
sparc64/sparc64/spitfire.c standard
@@ -137,4 +132,5 @@
sparc64/sparc64/trap.c standard
sparc64/sparc64/tsb.c standard
sparc64/sparc64/uio_machdep.c standard
+sparc64/sparc64/upa.c optional creator
sparc64/sparc64/vm_machdep.c standard
Index: systags.sh
===================================================================
RCS file: /home/cvs/src/sys/conf/systags.sh,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/conf/systags.sh -L sys/conf/systags.sh -u -r1.1.1.1 -r1.2
--- sys/conf/systags.sh
+++ sys/conf/systags.sh
@@ -28,7 +28,7 @@
# SUCH DAMAGE.
#
# @(#)systags.sh 8.1 (Berkeley) 6/10/93
-# $FreeBSD: src/sys/conf/systags.sh,v 1.9 2004/04/07 20:45:56 imp Exp $
+# $FreeBSD: src/sys/conf/systags.sh,v 1.10 2005/12/03 21:37:54 ru Exp $
#
# systags.sh - construct a system tags file using dependence relations
# in a .depend file
@@ -36,8 +36,7 @@
# First written May 16, 1992 by Van Jacobson, Lawrence Berkeley Laboratory.
rm -f tags tags.tmp tags.cfiles tags.sfiles tags.hfiles
-MACHINE=`uname -m`
-sed -e "s, machine/, ../../../$MACHINE/include/,g" \
+sed -e "s, machine/, ../../include/,g" \
-e 's,[a-z][^/ ]*/\.\./,,g' .depend | awk '{
for (i = 1; i <= NF; ++i) {
t = substr($i, length($i) - 1)
Index: Makefile.amd64
===================================================================
RCS file: /home/cvs/src/sys/conf/Makefile.amd64,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/conf/Makefile.amd64 -L sys/conf/Makefile.amd64 -u -r1.1.1.1 -r1.2
--- sys/conf/Makefile.amd64
+++ sys/conf/Makefile.amd64
@@ -2,7 +2,7 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.16.2.1 2005/10/28 19:04:03 jhb Exp $
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.24 2007/05/16 17:23:53 wkoszek Exp $
#
# Makefile for FreeBSD
#
@@ -18,7 +18,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
@@ -32,7 +32,7 @@
.include "$S/conf/kern.pre.mk"
DDB_ENABLED!= grep DDB opt_ddb.h || true
-.if ${DDB_ENABLED} != ""
+.if !empty(DDB_ENABLED)
CFLAGS+= -fno-omit-frame-pointer
.endif
Index: kern.post.mk
===================================================================
RCS file: /home/cvs/src/sys/conf/kern.post.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/conf/kern.post.mk -L sys/conf/kern.post.mk -u -r1.1.1.1 -r1.2
--- sys/conf/kern.post.mk
+++ sys/conf/kern.post.mk
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.post.mk,v 1.83.2.1 2005/11/16 10:03:02 ru Exp $
+# $FreeBSD: src/sys/conf/kern.post.mk,v 1.100 2007/03/23 21:55:59 imp Exp $
# Part of a unified Makefile for building kernels. This part includes all
# the definitions that need to be after all the % directives except %RULES
@@ -42,9 +42,9 @@
.ORDER: kernel-install modules-install
-kernel-all: ${KERNEL_KO}
+kernel-all: ${KERNEL_KO} ${KERNEL_EXTRA}
-kernel-cleandir: kernel-clean
+kernel-cleandir: kernel-clean kernel-cleandepend
kernel-clobber:
find . -maxdepth 1 ! -type d ! -name version -delete
@@ -63,10 +63,13 @@
FULLKERNEL= ${KERNEL_KO}
.else
FULLKERNEL= ${KERNEL_KO}.debug
-${KERNEL_KO}: ${FULLKERNEL}
- ${OBJCOPY} --strip-debug ${FULLKERNEL} ${KERNEL_KO}
+${KERNEL_KO}: ${FULLKERNEL} ${KERNEL_KO}.symbols
+ ${OBJCOPY} --strip-debug --add-gnu-debuglink=${KERNEL_KO}.symbols\
+ ${FULLKERNEL} ${.TARGET}
+${KERNEL_KO}.symbols: ${FULLKERNEL}
+ ${OBJCOPY} --only-keep-debug ${FULLKERNEL} ${.TARGET}
install.debug reinstall.debug: gdbinit
- cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG ${.TARGET:R}
+ cd ${.CURDIR}; ${MAKE} ${.TARGET:R}
# Install gdbinit files for kernel debugging.
gdbinit:
@@ -87,6 +90,15 @@
${OBJCOPY} --strip-debug ${.TARGET}
.endif
${SYSTEM_LD_TAIL}
+.if defined(MFS_IMAGE)
+ @dd if="${MFS_IMAGE}" ibs=8192 of="${FULLKERNEL}" \
+ obs=`strings -at d "${FULLKERNEL}" | \
+ grep "MFS Filesystem goes here" | awk '{print $$1}'` \
+ oseek=1 conv=notrunc 2>/dev/null && \
+ strings ${FULLKERNEL} | \
+ grep 'MFS Filesystem had better STOP here' > /dev/null || \
+ (rm ${FULLKERNEL} && echo 'MFS image too large' && false)
+.endif
.if !exists(${.OBJDIR}/.depend)
${SYSTEM_OBJS}: assym.s vnode_if.h ${BEFORE_DEPEND:M*.h} ${MFILES:T:S/.m$/.h/}
@@ -105,7 +117,8 @@
kernel-clean:
rm -f *.o *.so *.So *.ko *.s eddep errs \
- ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks tags vers.c \
+ ${FULLKERNEL} ${KERNEL_KO} ${KERNEL_KO}.symbols \
+ linterrs makelinks tags vers.c \
vnode_if.c vnode_if.h vnode_if_newproto.h vnode_if_typedef.h \
${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
${CLEAN}
@@ -119,7 +132,7 @@
# in the a.out ld. For now, this works.
HACK_EXTRA_FLAGS?= -shared
hack.So: Makefile
- touch hack.c
+ :> hack.c
${CC} ${HACK_EXTRA_FLAGS} -nostdlib hack.c -o hack.So
rm -f hack.c
@@ -137,9 +150,10 @@
kernel-depend: .depend
# The argument list can be very long, so use make -V and xargs to
# pass it to mkdep.
-.depend: assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
- ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
- ${MFILES:T:S/.m$/.h/}
+SRCS= assym.s vnode_if.h ${BEFORE_DEPEND} ${CFILES} \
+ ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
+ ${MFILES:T:S/.m$/.h/}
+.depend: .PRECIOUS ${SRCS}
rm -f .newdep
${MAKE} -V CFILES -V SYSTEM_CFILES -V GEN_CFILES | \
MKDEP_CPP="${CC} -E" CC="${CC}" xargs mkdep -a -f .newdep ${CFLAGS}
@@ -148,8 +162,31 @@
rm -f .depend
mv .newdep .depend
+_ILINKS= machine
+.if ${MACHINE} != ${MACHINE_ARCH}
+_ILINKS+= ${MACHINE_ARCH}
+.endif
+
+# Ensure that the link exists without depending on it when it exists.
+.for _link in ${_ILINKS}
+.if !exists(${.OBJDIR}/${_link})
+${SRCS}: ${_link}
+.endif
+.endfor
+
+${_ILINKS}:
+ @case ${.TARGET} in \
+ machine) \
+ path=${S}/${MACHINE}/include ;; \
+ ${MACHINE_ARCH}) \
+ path=${S}/${MACHINE_ARCH}/include ;; \
+ esac ; \
+ ${ECHO} ${.TARGET} "->" $$path ; \
+ ln -s $$path ${.TARGET}
+
+# .depend needs include links so we remove them only together.
kernel-cleandepend:
- rm -f .depend
+ rm -f .depend ${_ILINKS}
links:
egrep '#if' ${CFILES} | sed -f $S/conf/defines | \
@@ -162,27 +199,9 @@
kernel-tags:
@[ -f .depend ] || { echo "you must make depend first"; exit 1; }
sh $S/conf/systags.sh
- rm -f tags1
- sed -e 's, ../, ,' tags > tags1
-
-.if ${MACHINE_ARCH} != "ia64"
-.if exists(${DESTDIR}/boot)
-kernel-install-check:
- @if [ ! -f ${DESTDIR}/boot/device.hints ] ; then \
- echo "You must set up a ${DESTDIR}/boot/device.hints file first." ; \
- exit 1 ; \
- fi
- @if [ x"`grep device.hints ${DESTDIR}/boot/defaults/loader.conf ${DESTDIR}/boot/loader.conf`" = "x" ]; then \
- echo "You must activate /boot/device.hints in loader.conf." ; \
- exit 1 ; \
- fi
-
-kernel-install: kernel-install-check
-.endif
-.endif
kernel-install:
- @if [ ! -f ${FULLKERNEL} ] ; then \
+ @if [ ! -f ${KERNEL_KO} ] ; then \
echo "You must build a kernel first." ; \
exit 1 ; \
fi
@@ -201,18 +220,21 @@
fi
.endif
mkdir -p ${DESTDIR}${KODIR}
-.if defined(DEBUG) && defined(INSTALL_DEBUG)
- ${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}
-.else
${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
+.if defined(DEBUG) && !defined(INSTALL_NODEBUG)
+ ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
+.endif
+.if defined(KERNEL_EXTRA_INSTALL)
+ ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_EXTRA_INSTALL} ${DESTDIR}${KODIR}
.endif
+
+
kernel-reinstall:
@-chflags -R noschg ${DESTDIR}${KODIR}
-.if defined(DEBUG) && defined(INSTALL_DEBUG)
- ${INSTALL} -p -m 555 -o root -g wheel ${FULLKERNEL} ${DESTDIR}${KODIR}
-.else
${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO} ${DESTDIR}${KODIR}
+.if defined(DEBUG) && !defined(INSTALL_NODEBUG)
+ ${INSTALL} -p -m 555 -o root -g wheel ${KERNEL_KO}.symbols ${DESTDIR}${KODIR}
.endif
config.o env.o hints.o vers.o vnode_if.o:
@@ -227,9 +249,13 @@
vnode_if.c: $S/tools/vnode_if.awk $S/kern/vnode_if.src
${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -c
-vnode_if.h: $S/tools/vnode_if.awk $S/kern/vnode_if.src
+vnode_if.h vnode_if_newproto.h vnode_if_typedef.h: $S/tools/vnode_if.awk \
+ $S/kern/vnode_if.src
+vnode_if.h: vnode_if_newproto.h vnode_if_typedef.h
${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -h
+vnode_if_newproto.h:
${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -p
+vnode_if_typedef.h:
${AWK} -f $S/tools/vnode_if.awk $S/kern/vnode_if.src -q
# XXX strictly, everything depends on Makefile because changes to ${PROF}
Index: NOTES
===================================================================
RCS file: /home/cvs/src/sys/conf/NOTES,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/conf/NOTES -L sys/conf/NOTES -u -r1.2 -r1.3
--- sys/conf/NOTES
+++ sys/conf/NOTES
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.13 2006/02/23 02:13:30 mlaier Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1454 2007/09/26 21:14:17 marius Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -56,7 +56,7 @@
#
# CONF_CFLAGS gives some extra compiler flags that are added to ${CFLAGS}
# after most other flags. Here we use it to inhibit use of non-optimal
-# gcc builtin functions (e.g., memcmp).
+# gcc built-in functions (e.g., memcmp).
#
# DEBUG happens to be magic.
# The following is equivalent to 'config -g KERNELNAME' and creates
@@ -73,8 +73,8 @@
makeoptions CONF_CFLAGS=-fno-builtin #Don't allow use of memcmp, etc.
#makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols
#makeoptions KERNEL=foo #Build kernel "foo" and install "/foo"
-# Only build Linux API modules and plus those parts of the sound system I need.
-#makeoptions MODULES_OVERRIDE="linux sound/sound sound/driver/maestro3"
+# Only build ext2fs module plus those parts of the sound system I need.
+#makeoptions MODULES_OVERRIDE="ext2fs sound/sound sound/driver/maestro3"
makeoptions DESTDIR=/tmp
#
@@ -110,15 +110,20 @@
#
options BLKDEV_IOSIZE=8192
-# Options for the VM subsystem
-# L2 cache size (in KB) can be specified in PQ_CACHESIZE
-options PQ_CACHESIZE=512 # color for 512k cache
-# Deprecated options supported for backwards compatibility
-#options PQ_NOOPT # No coloring
-#options PQ_LARGECACHE # color for 512k cache
-#options PQ_HUGECACHE # color for 1024k cache
-#options PQ_MEDIUMCACHE # color for 256k cache
-#options PQ_NORMALCACHE # color for 64k cache
+#
+# MAXPHYS and DFLTPHYS
+#
+# These are the max and default 'raw' I/O block device access sizes.
+# Reads and writes will be split into DFLTPHYS chunks. Some applications
+# have better performance with larger raw I/O access sizes. Typically
+# MAXPHYS should be twice the size of DFLTPHYS. Note that certain VM
+# parameters are derived from these values and making them too large
+# can make an an unbootable kernel.
+#
+# The defaults are 64K and 128K respectively.
+options DFLTPHYS=(64*1024)
+options MAXPHYS=(128*1024)
+
# This allows you to actually store this configuration file into
# the kernel binary itself, where it may be later read by saying:
@@ -127,26 +132,31 @@
options INCLUDE_CONFIG_FILE # Include this file in kernel
options GEOM_AES # Don't use, use GEOM_BDE
-options GEOM_APPLE # Apple partitioning
options GEOM_BDE # Disk encryption.
options GEOM_BSD # BSD disklabels
+options GEOM_CACHE # Disk cache.
options GEOM_CONCAT # Disk concatenation.
options GEOM_ELI # Disk encryption.
options GEOM_FOX # Redundant path mitigation
options GEOM_GATE # Userland services.
-options GEOM_GPT # GPT partitioning
+options GEOM_JOURNAL # Journaling.
options GEOM_LABEL # Providers labelization.
options GEOM_MBR # DOS/MBR partitioning
options GEOM_MIRROR # Disk mirroring.
+options GEOM_MULTIPATH # Disk multipath
options GEOM_NOP # Test class.
+options GEOM_PART_APM # Apple partitioning
+options GEOM_PART_GPT # GPT partitioning
+options GEOM_PART_MBR # MBR partitioning
options GEOM_PC98 # NEC PC9800 partitioning
options GEOM_RAID3 # RAID3 functionality.
options GEOM_SHSEC # Shared secret.
options GEOM_STRIPE # Disk striping.
options GEOM_SUNLABEL # Sun/Solaris partitioning
options GEOM_UZIP # Read-only compressed disks
+options GEOM_VIRSTOR # Virtual storage.
options GEOM_VOL # Volume names from UFS superblock
-options GEOM_ZERO # Peformance testing helper.
+options GEOM_ZERO # Performance testing helper.
#
# The root device and filesystem type can be compiled in;
@@ -164,12 +174,14 @@
# select which scheduler is compiled in.
#
# SCHED_4BSD is the historical, proven, BSD scheduler. It has a global run
-# queue and no cpu affinity which makes it suboptimal for SMP. It has very
+# queue and no CPU affinity which makes it suboptimal for SMP. It has very
# good interactivity and priority selection.
#
-# SCHED_ULE is a new scheduler that has been designed for SMP and has some
-# advantages for UP as well. It is intended to replace the 4BSD scheduler
-# over time.
+# SCHED_ULE provides significant performance advantages over 4BSD on many
+# workloads on SMP machines. It supports cpu-affinity, per-cpu runqueues
+# and scheduler locks. It also has a stronger notion of interactivity
+# which leads to better responsiveness even on uniprocessor machines. This
+# will eventually become the default scheduler.
#
options SCHED_4BSD
#options SCHED_ULE
@@ -188,30 +200,51 @@
# to disable it.
options NO_ADAPTIVE_MUTEXES
+# ADAPTIVE_RWLOCKS changes the behavior of reader/writer locks to spin
+# if the thread that currently owns the rwlock is executing on another
+# CPU. This behaviour is enabled by default, so this option can be used
+# to disable it.
+options NO_ADAPTIVE_RWLOCKS
+
# ADAPTIVE_GIANT causes the Giant lock to also be made adaptive when
# running without NO_ADAPTIVE_MUTEXES. Normally, because Giant is assumed
# to be held for extended periods, contention on Giant will cause a thread
# to sleep rather than spinning.
options ADAPTIVE_GIANT
+# ADAPTIVE_SX changes the behavior of sx locks to spin if the thread
+# that currently owns the lock is executing on another CPU. Note that
+# in addition to enabling this option, individual sx locks must be
+# initialized with the SX_ADAPTIVESPIN flag.
+options ADAPTIVE_SX
+
# MUTEX_NOINLINE forces mutex operations to call functions to perform each
# operation rather than inlining the simple cases. This can be used to
# shrink the size of the kernel text segment. Note that this behavior is
-# already implied by the INVARIANT_SUPPORT, INVARIANTS, MUTEX_PROFILING,
+# already implied by the INVARIANT_SUPPORT, INVARIANTS, KTR, LOCK_PROFILING,
# and WITNESS options.
options MUTEX_NOINLINE
-# MUTEX_WAKE_ALL changes the mutex unlock algorithm to wake all waiters
-# when a contested mutex is released rather than just awaking the highest
-# priority waiter.
-options MUTEX_WAKE_ALL
+# RWLOCK_NOINLINE forces rwlock operations to call functions to perform each
+# operation rather than inlining the simple cases. This can be used to
+# shrink the size of the kernel text segment. Note that this behavior is
+# already implied by the INVARIANT_SUPPORT, INVARIANTS, KTR, LOCK_PROFILING,
+# and WITNESS options.
+options RWLOCK_NOINLINE
+
+# SX_NOINLINE forces sx lock operations to call functions to perform each
+# operation rather than inlining the simple cases. This can be used to
+# shrink the size of the kernel text segment. Note that this behavior is
+# already implied by the INVARIANT_SUPPORT, INVARIANTS, KTR, LOCK_PROFILING,
+# and WITNESS options.
+options SX_NOINLINE
# SMP Debugging Options:
#
# PREEMPTION allows the threads that are in the kernel to be preempted
# by higher priority threads. It helps with interactivity and
# allows interrupt threads to run sooner rather than waiting.
-# WARNING! Only tested on alpha, amd64, and i386.
+# WARNING! Only tested on amd64 and i386.
# FULL_PREEMPTION instructs the kernel to preempt non-realtime kernel
# threads. Its sole use is to expose race conditions and other
# bugs during development. Enabling this option will reduce
@@ -236,9 +269,8 @@
options WITNESS_KDB
options WITNESS_SKIPSPIN
-# MUTEX_PROFILING - Profiling mutual exclusion locks (mutexes). See
-# MUTEX_PROFILING(9) for details.
-options MUTEX_PROFILING
+# LOCK_PROFILING - Profiling locks. See LOCK_PROFILING(9) for details.
+options LOCK_PROFILING
# Set the number of buffers and the hash size. The hash size MUST be larger
# than the number of buffers. Hash size should be prime.
options MPROF_BUFFERS="1536"
@@ -262,12 +294,18 @@
#
options COMPAT_43
+# Old tty interface.
+options COMPAT_43TTY
+
# Enable FreeBSD4 compatibility syscalls
options COMPAT_FREEBSD4
# Enable FreeBSD5 compatibility syscalls
options COMPAT_FREEBSD5
+# Enable FreeBSD6 compatibility syscalls
+options COMPAT_FREEBSD6
+
#
# These three options provide support for System V Interface
# Definition-style interprocess communication, in the form of shared
@@ -317,7 +355,7 @@
#
# SYSCTL_DEBUG enables a 'sysctl' debug tree that can be used to dump the
# contents of the registered sysctl nodes on the console. It is disabled by
-# default because it generates excessively verbose consol output that can
+# default because it generates excessively verbose console output that can
# interfere with serial console operation.
#
options SYSCTL_DEBUG
@@ -330,6 +368,12 @@
options DEBUG_MEMGUARD
#
+# DEBUG_REDZONE enables buffer underflows and buffer overflows detection for
+# malloc(9).
+#
+options DEBUG_REDZONE
+
+#
# KTRACE enables the system-call tracing facility ktrace(2). To be more
# SMP-friendly, KTRACE uses a worker thread to process most trace events
# asynchronously to the thread generating the event. This requires a
@@ -342,16 +386,18 @@
options KTRACE_REQUEST_POOL=101
#
-# KTR is a kernel tracing mechanism imported from BSD/OS. Currently it
-# has no userland interface aside from a few sysctl's. It is enabled with
-# the KTR option. KTR_ENTRIES defines the number of entries in the circular
-# trace buffer. KTR_COMPILE defines the mask of events to compile into the
-# kernel as defined by the KTR_* constants in <sys/ktr.h>. KTR_MASK defines the
-# initial value of the ktr_mask variable which determines at runtime what
-# events to trace. KTR_CPUMASK determines which CPU's log events, with
-# bit X corresponding to cpu X. KTR_VERBOSE enables dumping of KTR events
-# to the console by default. This functionality can be toggled via the
-# debug.ktr_verbose sysctl and defaults to off if KTR_VERBOSE is not defined.
+# KTR is a kernel tracing mechanism imported from BSD/OS. Currently
+# it has no userland interface aside from a few sysctl's. It is
+# enabled with the KTR option. KTR_ENTRIES defines the number of
+# entries in the circular trace buffer; it must be a power of two.
+# KTR_COMPILE defines the mask of events to compile into the kernel as
+# defined by the KTR_* constants in <sys/ktr.h>. KTR_MASK defines the
+# initial value of the ktr_mask variable which determines at runtime
+# what events to trace. KTR_CPUMASK determines which CPU's log
+# events, with bit X corresponding to CPU X. KTR_VERBOSE enables
+# dumping of KTR events to the console by default. This functionality
+# can be toggled via the debug.ktr_verbose sysctl and defaults to off
+# if KTR_VERBOSE is not defined.
#
options KTR
options KTR_ENTRIES=1024
@@ -361,7 +407,7 @@
options KTR_VERBOSE
#
-# ALQ(9) is a facilty for the asynchronous queuing of records from the kernel
+# ALQ(9) is a facility for the asynchronous queuing of records from the kernel
# to a vnode, and is employed by services such as KTR(4) to produce trace
# files based on a kernel event stream. Records are written asynchronously
# in a worker thread.
@@ -409,7 +455,7 @@
#
# RESTARTABLE_PANICS allows one to continue from a panic as if it were
-# a call to the debugger via the Debugger() function instead. It is only
+# a call to the debugger to continue from a panic as instead. It is only
# useful if a kernel debugger is present. To restart from a panic, reset
# the panicstr variable to NULL and continue execution. This option is
# for development use only and should NOT be used in production systems
@@ -437,7 +483,7 @@
#
# Additional configuration options may be required on specific architectures,
# please see hwpmc(4).
-#
+
device hwpmc # Driver (also a loadable module)
options HWPMC_HOOKS # Other necessary kernel hooks
@@ -446,29 +492,27 @@
# NETWORKING OPTIONS
#
-# Protocol families:
-# Only the INET (Internet) family is officially supported in FreeBSD.
+# Protocol families
#
options INET #Internet communications protocols
options INET6 #IPv6 communications protocols
-options IPSEC #IP security
-options IPSEC_ESP #IP security (crypto; define w/ IPSEC)
-options IPSEC_DEBUG #debug for IP security
-#
-# Set IPSEC_FILTERGIF to force packets coming through a gif tunnel
-# to be processed by any configured packet filtering (ipfw, ipf).
-# The default is that packets coming from a tunnel are _not_ processed;
+
+# In order to enable IPSEC you MUST also add device crypto to
+# your kernel configuration
+options IPSEC #IP security (requires device crypto)
+#options IPSEC_DEBUG #debug for IP security
+#
+# Set IPSEC_FILTERTUNNEL to force packets coming through a tunnel
+# to be processed by any configured packet filtering twice.
+# The default is that packets coming out of a tunnel are _not_ processed;
# they are assumed trusted.
#
# IPSEC history is preserved for such packets, and can be filtered
# using ipfw(8)'s 'ipsec' keyword, when this option is enabled.
#
-#options IPSEC_FILTERGIF #filter ipsec packets from a tunnel
-
-#options FAST_IPSEC #new IPsec (cannot define w/ IPSEC)
+#options IPSEC_FILTERTUNNEL #filter ipsec packets from a tunnel
options IPX #IPX/SPX communications protocols
-options IPXIP #IPX in IP encapsulation (not available)
options NCP #NetWare Core protocol
@@ -479,9 +523,7 @@
# SMB/CIFS requester
# NETSMB enables support for SMB protocol, it requires LIBMCHAIN and LIBICONV
# options.
-# NETSMBCRYPTO enables support for encrypted passwords.
options NETSMB #SMB/CIFS requester
-options NETSMBCRYPTO #encrypted password support for SMB
# mchain library. It can be either loaded as KLD or compiled into kernel
options LIBMCHAIN
@@ -489,10 +531,78 @@
# libalias library, performing NAT
options LIBALIAS
+#
+# SCTP is a NEW transport protocol defined by
+# RFC2960 updated by RFC3309 and RFC3758.. and
+# soon to have a new base RFC and many many more
+# extensions. This release supports all the extensions
+# including many drafts (most about to become RFC's).
+# It is the premeier SCTP implementation in the NET
+# and is quite well tested.
+#
+# Note YOU MUST have both INET and INET6 defined.
+# you don't have to enable V6, but SCTP is
+# dual stacked and so far we have not teased apart
+# the V6 and V4.. since an association can span
+# both a V6 and V4 address at the SAME time :-)
+#
+options SCTP
+# There are bunches of options:
+# this one turns on all sorts of
+# nastly printing that you can
+# do. Its all controled by a
+# bit mask (settable by socket opt and
+# by sysctl). Including will not cause
+# logging until you set the bits.. but it
+# can be quite verbose.. so without this
+# option we don't do any of the tests for
+# bits and prints.. which makes the code run
+# faster.. if you are not debugging don't use.
+options SCTP_DEBUG
+#
+# This option turns off the CRC32c checksum. Basically
+# You will not be able to talk to anyone else that
+# has not done this. Its more for expermentation to
+# see how much CPU the CRC32c really takes. Most new
+# cards for TCP support checksum offload.. so this
+# option gives you a "view" into what SCTP would be
+# like with such an offload (which only exists in
+# high in iSCSI boards so far). With the new
+# splitting 8's algorithm its not as bad as it used
+# to be.. but it does speed things up try only
+# for in a captured lab environment :-)
+options SCTP_WITH_NO_CSUM
+#
+
+#
+# All that options after that turn on specific types of
+# logging. You can monitor CWND growth, flight size
+# and all sorts of things. Go look at the code and
+# see. I have used this to produce interesting
+# charts and graphs as well :->
+#
+# I have not yet commited the tools to get and print
+# the logs, I will do that eventually .. before then
+# if you want them send me an email rrs at freebsd.org
+# You basically must have KTR enabled for these
+# and you then set the sysctl to turn on/off various
+# logging bits. Use ktrdump to pull the log and run
+# it through a dispaly program.. and graphs and other
+# things too.
+#
+options SCTP_LOCK_LOGGING
+options SCTP_MBUF_LOGGING
+options SCTP_MBCNT_LOGGING
+options SCTP_PACKET_LOGGING
+options SCTP_LTRACE_CHUNKS
+options SCTP_LTRACE_ERRORS
+
+
# altq(9). Enable the base part of the hooks with the ALTQ option.
# Individual disciplines must be built into the base system and can not be
-# loaded as modules at this point. In order to build a SMP kernel you must
-# also have the ALTQ_NOPCC option.
+# loaded as modules at this point. ALTQ requires a stable TSC so if yours is
+# broken or changes with CPU throttling then you must also have the ALTQ_NOPCC
+# option.
options ALTQ
options ALTQ_CBQ # Class Bases Queueing
options ALTQ_RED # Random Early Detection
@@ -500,7 +610,7 @@
options ALTQ_HFSC # Hierarchical Packet Scheduler
options ALTQ_CDNR # Traffic conditioner
options ALTQ_PRIQ # Priority Queueing
-options ALTQ_NOPCC # Required for SMP build
+options ALTQ_NOPCC # Required if the TSC is unusable
options ALTQ_DEBUG
# netgraph(4). Enable the base netgraph code with the NETGRAPH option.
@@ -526,7 +636,9 @@
options NETGRAPH_BLUETOOTH_UBTBCMFW # ubtbcmfw(4)
options NETGRAPH_BPF
options NETGRAPH_BRIDGE
+options NETGRAPH_CAR
options NETGRAPH_CISCO
+options NETGRAPH_DEFLATE
options NETGRAPH_DEVICE
options NETGRAPH_ECHO
options NETGRAPH_EIFACE
@@ -551,10 +663,12 @@
options NETGRAPH_PPP
options NETGRAPH_PPPOE
options NETGRAPH_PPTPGRE
+options NETGRAPH_PRED1
options NETGRAPH_RFC1490
options NETGRAPH_SOCKET
options NETGRAPH_SPLIT
options NETGRAPH_SPPP
+options NETGRAPH_TAG
options NETGRAPH_TCPMSS
options NETGRAPH_TEE
options NETGRAPH_TTY
@@ -603,7 +717,9 @@
# simultaneous BPF clients programs runnable. DHCP requires bpf.
# The `disc' device implements a minimal network interface,
# which throws away all packets sent and never receives any. It is
-# included for testing purposes. This shows up as the `ds' interface.
+# included for testing and benchmarking purposes.
+# The `edsc' device implements a minimal Ethernet interface,
+# which discards all packets sent and receives none.
# The `tap' device is a pty-like virtual Ethernet interface
# The `tun' device implements (user-)ppp and nos-tun
# The `gif' device implements IPv6 over IP4 tunneling,
@@ -639,13 +755,17 @@
device wlan_tkip #802.11 TKIP support
device wlan_xauth #802.11 external authenticator support
device wlan_acl #802.11 MAC ACL support
+device wlan_amrr #AMRR transmit rate control algorithm
+device wlan_scan_ap #802.11 AP mode scanning
+device wlan_scan_sta #802.11 STA mode scanning
device token #Generic TokenRing
device fddi #Generic FDDI
device arcnet #Generic Arcnet
device sppp #Generic Synchronous PPP
device loop #Network loopback device
device bpf #Berkeley packet filter
-device disc #Discard device (ds0, ds1, etc)
+device disc #Discard device based on loopback
+device edsc #Ethernet discard device
device tap #Virtual Ethernet driver
device tun #Tunnel driver (ppp(8), nos-tun(8))
device sl #Serial Line IP
@@ -655,10 +775,12 @@
device pflog #logging support interface for PF
device pfsync #synchronization interface for PF
device carp #Common Address Redundancy Protocol
+device enc #IPsec interface
device ppp #Point-to-point protocol
options PPP_BSDCOMP #PPP BSD-compress support
options PPP_DEFLATE #PPP zlib/deflate/gzip support
options PPP_FILTER #enable bpf filtering (needs bpf)
+device lagg #Link aggregation interface
device ef # Multiple ethernet frames support
options ETHER_II # enable Ethernet_II frame
@@ -676,10 +798,7 @@
# Internet family options:
#
# MROUTING enables the kernel multicast packet forwarder, which works
-# with mrouted(8).
-#
-# PIM enables Protocol Independent Multicast in the kernel.
-# Requires MROUTING enabled.
+# with mrouted and XORP.
#
# IPFIREWALL enables support for IP firewall construction, in
# conjunction with the `ipfw' program. IPFIREWALL_VERBOSE sends
@@ -706,15 +825,16 @@
#
# IPFIREWALL_FORWARD enables changing of the packet destination either
# to do some sort of policy routing or transparent proxying. Used by
-# ``ipfw forward''.
-#
-# IPFIREWALL_FORWARD_EXTENDED enables full packet destination changing
-# including redirecting packets to local IP addresses and ports. All
-# redirections apply to locally generated packets too. Because of this
-# great care is required when crafting the ruleset.
+# ``ipfw forward''. All redirections apply to locally generated
+# packets too. Because of this great care is required when
+# crafting the ruleset.
+#
+# IPFIREWALL_NAT adds support for in kernel nat in ipfw, and it requires
+# LIBALIAS. To build an ipfw kld with nat support enabled, add
+# "CFLAGS+= -DIPFIREWALL_NAT" to your make.conf.
#
# IPSTEALTH enables code to support stealth forwarding (i.e., forwarding
-# packets without touching the ttl). This can be useful to hide firewalls
+# packets without touching the TTL). This can be useful to hide firewalls
# from traceroute and similar tools.
#
# TCPDEBUG enables code which keeps traces of the TCP state machine
@@ -722,17 +842,12 @@
# using the trpt(8) utility.
#
options MROUTING # Multicast routing
-options PIM # Protocol Independent Multicast
options IPFIREWALL #firewall
options IPFIREWALL_VERBOSE #enable logging to syslogd(8)
options IPFIREWALL_VERBOSE_LIMIT=100 #limit verbosity
options IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
options IPFIREWALL_FORWARD #packet destination changes
-options IPFIREWALL_FORWARD_EXTENDED #all packet dest changes
-options IPV6FIREWALL #firewall for IPv6
-options IPV6FIREWALL_VERBOSE
-options IPV6FIREWALL_VERBOSE_LIMIT=100
-options IPV6FIREWALL_DEFAULT_TO_ACCEPT
+options IPFIREWALL_NAT #ipfw kernel nat support
options IPDIVERT #divert sockets
options IPFILTER #ipfilter support
options IPFILTER_LOG #ipfilter logging
@@ -750,34 +865,20 @@
options ACCEPT_FILTER_DATA
options ACCEPT_FILTER_HTTP
-# TCP_DROP_SYNFIN adds support for ignoring TCP packets with SYN+FIN. This
-# prevents nmap et al. from identifying the TCP/IP stack, but breaks support
-# for RFC1644 extensions and is not recommended for web servers.
-#
-options TCP_DROP_SYNFIN #drop TCP packets with SYN+FIN
-
# TCP_SIGNATURE adds support for RFC 2385 (TCP-MD5) digests. These are
# carried in TCP option 19. This option is commonly used to protect
# TCP sessions (e.g. BGP) where IPSEC is not available nor desirable.
# This is enabled on a per-socket basis using the TCP_MD5SIG socket option.
-# This requires the use of 'device crypto', 'options FAST_IPSEC' or 'options
-# IPSEC', and 'device cryptodev'.
+# This requires the use of 'device crypto', 'options IPSEC'
+# or 'device cryptodev'.
#options TCP_SIGNATURE #include support for RFC 2385
# DUMMYNET enables the "dummynet" bandwidth limiter. You need IPFIREWALL
# as well. See dummynet(4) and ipfw(8) for more info. When you run
# DUMMYNET it is advisable to also have "options HZ=1000" to achieve a
# smoother scheduling of the traffic.
-#
options DUMMYNET
-# BRIDGE enables bridging between ethernet cards -- see bridge(4).
-# You can use IPFIREWALL and DUMMYNET together with bridging.
-# NOTE: This option is deprecated and will be removed in the future.
-# See if_bridge(4) for an alternative.
-#
-options BRIDGE
-
# Zero copy sockets support. This enables "zero copy" for sending and
# receiving data via a socket. The send side works for any type of NIC,
# the receive side only works for NICs that support MTUs greater than the
@@ -788,6 +889,8 @@
#
# ATM (HARP version) options
#
+# XXX: These have been disabled in FreeBSD 7.0 as they are not MPSAFE.
+#
# ATM_CORE includes the base ATM functionality code. This must be included
# for ATM support.
#
@@ -806,14 +909,14 @@
#
# The `harp' pseudo-driver makes all NATM interface drivers available to HARP.
#
-options ATM_CORE #core ATM protocol family
-options ATM_IP #IP over ATM support
-options ATM_SIGPVC #SIGPVC signalling manager
-options ATM_SPANS #SPANS signalling manager
-options ATM_UNI #UNI signalling manager
+#options ATM_CORE #core ATM protocol family
+#options ATM_IP #IP over ATM support
+#options ATM_SIGPVC #SIGPVC signalling manager
+#options ATM_SPANS #SPANS signalling manager
+#options ATM_UNI #UNI signalling manager
-device hfa #FORE PCA-200E ATM PCI
-device harp #Pseudo-interface for NATM
+#device hfa #FORE PCA-200E ATM PCI
+#device harp #Pseudo-interface for NATM
#####################################################################
@@ -826,10 +929,12 @@
# currently be demand-loaded.) Some people still prefer to statically
# compile other filesystems as well.
#
-# NB: The NULL, PORTAL, UMAP and UNION filesystems are known to be
-# buggy, and WILL panic your system if you attempt to do anything with
-# them. They are included here as an incentive for some enterprising
-# soul to sit down and fix them.
+# NB: The PORTAL filesystem is known to be buggy, and WILL panic your
+# system if you attempt to do anything with it. It is included here
+# as an incentive for some enterprising soul to sit down and fix it.
+# The UNION filesystem was known to be buggy in the past. It is now
+# being actively maintained, although there are still some issues being
+# resolved.
#
# One of these is mandatory:
@@ -839,6 +944,7 @@
# The rest are optional:
options CD9660 #ISO 9660 filesystem
options FDESCFS #File descriptor filesystem
+options HPFS #OS/2 File system
options MSDOSFS #MS DOS File System (FAT, FAT32)
options NFSSERVER #Network File System server
options NTFS #NT File System
@@ -851,8 +957,6 @@
options PSEUDOFS_TRACE #Debugging support for PSEUDOFS
options SMBFS #SMB/CIFS filesystem
options UDF #Universal Disk Format
-# Broken (seriously (functionally) broken):
-#options UMAPFS #UID map filesystem
options UNIONFS #Union filesystem
# The xFS_ROOT options REQUIRE the associated ``options xFS''
options NFS_ROOT #NFS usable as root device
@@ -878,6 +982,9 @@
# directories at the expense of some memory.
options UFS_DIRHASH
+# Gjournal-based UFS journaling support.
+options UFS_GJOURNAL
+
# Make space in the kernel for a root filesystem on a md device.
# Define to the number of kilobytes to reserve for the filesystem.
options MD_ROOT_SIZE=10
@@ -934,6 +1041,12 @@
#
options REISERFS
+#
+# Add support for the SGI XFS filesystem. Currently,
+# this is limited to read-only access.
+#
+options XFS
+
# Use real implementations of the aio_* system calls. There are numerous
# stability and security issues in the current aio code that make it
# unsuitable for inclusion on machines with untrusted local users.
@@ -952,23 +1065,11 @@
options NTFS_ICONV
options UDF_ICONV
-# Experimental support for large MS-DOS filesystems.
-#
-# WARNING: This uses at least 32 bytes of kernel memory (which is not
-# reclaimed until the FS is unmounted) for each file on disk to map
-# between the 32-bit inode numbers used by VFS and the 64-bit pseudo-inode
-# numbers used internally by msdosfs. This is only safe to use in certain
-# controlled situations (e.g. read-only FS with less than 1 million files).
-# Since the mappings do not persist across unmounts (or reboots), these
-# filesystems are not suitable for exporting through NFS, or any other
-# application that requires fixed inode numbers.
-options MSDOSFS_LARGE
-
#####################################################################
# POSIX P1003.1B
-# Real time extensions added in the 1993 Posix
+# Real time extensions added in the 1993 POSIX
# _KPOSIX_PRIORITY_SCHEDULING: Build in _POSIX_PRIORITY_SCHEDULING
options _KPOSIX_PRIORITY_SCHEDULING
@@ -976,15 +1077,19 @@
# user should be ready to assist in debugging if problems arise.
options P1003_1B_SEMAPHORES
+# POSIX message queue
+options P1003_1B_MQUEUE
#####################################################################
# SECURITY POLICY PARAMETERS
+# Support for BSM audit
+options AUDIT
+
# Support for Mandatory Access Control (MAC):
options MAC
options MAC_BIBA
options MAC_BSDEXTENDED
-options MAC_DEBUG
options MAC_IFOFF
options MAC_LOMAC
options MAC_MLS
@@ -1080,6 +1185,10 @@
#
# The pt driver drives SCSI Processor devices.
#
+# The sg driver provides a passthrough API that is compatible with the
+# Linux SG driver. It will work in conjunction with the COMPAT_LINUX
+# option to run linux SG apps. It can also stand on its own and provide
+# source level API compatiblity for porting apps to FreeBSD.
#
# Target Mode support is provided here but also requires that a SIM
# (SCSI Host Adapter Driver) provide support as well.
@@ -1106,6 +1215,7 @@
device targ #SCSI Target Mode Code
device targbh #SCSI Target Mode Blackhole Device
device pass #CAM passthrough driver
+device sg #Linux SCSI passthrough
# CAM OPTIONS:
# debugging options:
@@ -1119,8 +1229,6 @@
# CAM_DEBUG_SUBTRACE, and CAM_DEBUG_CDB
#
# CAM_MAX_HIGHPOWER: Maximum number of concurrent high power (start unit) cmds
-# CAM_NEW_TRAN_CODE: this is the new transport layer code that will be switched
-# to soon
# SCSI_NO_SENSE_STRINGS: When defined disables sense descriptions
# SCSI_NO_OP_STRINGS: When defined disables opcode descriptions
# SCSI_DELAY: The number of MILLISECONDS to freeze the SIM (scsi adapter)
@@ -1205,69 +1313,17 @@
# HARDWARE DEVICE CONFIGURATION
# For ISA the required hints are listed.
-# EISA, MCA, PCI and pccard are self identifying buses, so no hints
-# are needed.
+# EISA, MCA, PCI, CardBus, SD/MMC and pccard are self identifying buses, so
+# no hints are needed.
#
# Mandatory devices:
#
-# The keyboard controller; it controls the keyboard and the PS/2 mouse.
-device atkbdc
-hint.atkbdc.0.at="isa"
-hint.atkbdc.0.port="0x060"
-
-# The AT keyboard
-device atkbd
-hint.atkbd.0.at="atkbdc"
-hint.atkbd.0.irq="1"
-
-# Options for atkbd:
-options ATKBD_DFLT_KEYMAP # specify the built-in keymap
-makeoptions ATKBD_DFLT_KEYMAP=jp.106
-
# These options are valid for other keyboard drivers as well.
options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-# `flags' for atkbd:
-# 0x01 Force detection of keyboard, else we always assume a keyboard
-# 0x02 Don't reset keyboard, useful for some newer ThinkPads
-# 0x03 Force detection and avoid reset, might help with certain
-# dockingstations
-# 0x04 Old-style (XT) keyboard support, useful for older ThinkPads
-
-# PS/2 mouse
-device psm
-hint.psm.0.at="atkbdc"
-hint.psm.0.irq="12"
-
-# Options for psm:
-options PSM_HOOKRESUME #hook the system resume event, useful
- #for some laptops
-options PSM_RESETAFTERSUSPEND #reset the device at the resume event
-
-# Video card driver for VGA adapters.
-device vga
-hint.vga.0.at="isa"
-
-# Options for vga:
-# Try the following option if the mouse pointer is not drawn correctly
-# or font does not seem to be loaded properly. May cause flicker on
-# some systems.
-options VGA_ALT_SEQACCESS
-
-# If you can dispense with some vga driver features, you may want to
-# use the following options to save some memory.
-#options VGA_NO_FONT_LOADING # don't save/load font
-#options VGA_NO_MODE_CHANGE # don't change video modes
-
-# Older video cards may require this option for proper operation.
-options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs
-
-# The following option probably won't work with the LCD displays.
-options VGA_WIDTH90 # support 90 column modes
-
options FB_DEBUG # Frame buffer debugging
device splash # Splash screen and screen saver support
@@ -1285,7 +1341,7 @@
device star_saver
device warp_saver
-# The syscons console driver (sco color console compatible).
+# The syscons console driver (SCO color console compatible).
device sc
hint.sc.0.at="isa"
options MAXCONS=16 # number of virtual consoles
@@ -1318,6 +1374,7 @@
options SC_NO_CUTPASTE
options SC_NO_FONT_LOADING
options SC_NO_HISTORY
+options SC_NO_MODE_CHANGE
options SC_NO_SYSMOUSE
options SC_NO_SUSPEND_VTYSWITCH
@@ -1350,6 +1407,7 @@
# ISP 12160 Ultra3 SCSI,
# Qlogic ISP 2100 and ISP 2200 1Gb Fibre Channel host adapters.
# Qlogic ISP 2300 and ISP 2312 2Gb Fibre Channel host adapters.
+# Qlogic ISP 2322 and ISP 6322 2Gb Fibre Channel host adapters.
# ispfw: Firmware module for Qlogic host adapters
# mpt: LSI-Logic MPT/Fusion 53c1020 or 53c1030 Ultra4
# or FC9x9 Fibre Channel host adapters.
@@ -1380,6 +1438,7 @@
device ahd
device amd
device esp
+device iscsi_initiator
device isp
hint.isp.0.disable="1"
hint.isp.0.role="3"
@@ -1445,11 +1504,23 @@
# controllers that have it configured only if this option is set.
options ADW_ALLOW_MEMIO
+# Options used in dev/iscsi (Software iSCSI stack)
+#
+options ISCSI_INITIATOR_DEBUG=9
+
# Options used in dev/isp/ (Qlogic SCSI/FC driver).
#
# ISP_TARGET_MODE - enable target mode operation
#
options ISP_TARGET_MODE=1
+#
+# ISP_DEFAULT_ROLES - default role
+# none=0
+# target=1
+# initiator=2
+# both=3 (not supported currently)
+#
+options ISP_DEFAULT_ROLES=2
# Options used in dev/sym/ (Symbios SCSI driver).
#options SYM_SETUP_LP_PROBE_MAP #-Low Priority Probe Map (bits)
@@ -1464,12 +1535,6 @@
#options SYM_SETUP_MAX_LUN #-Number of LUNs supported
# default:8, range:[1..64]
-# The 'asr' driver provides support for current DPT/Adaptec SCSI RAID
-# controllers (SmartRAID V and VI and later).
-# These controllers require the CAM infrastructure.
-#
-device asr
-
# The 'dpt' driver provides support for old DPT controllers (http://www.dpt.com/).
# These have hardware RAID-{0,1,5} support, and do multi-initiator I/O.
# The DPT controllers are commonly re-licensed under other brand-names -
@@ -1535,6 +1600,9 @@
device ida # Compaq Smart RAID
device mlx # Mylex DAC960
device amr # AMI MegaRAID
+device mfi # LSI MegaRAID SAS
+device mfip # LSI MegaRAID SAS passthrough, requires CAM
+options MFI_DEBUG
#
# 3ware ATA RAID
@@ -1597,35 +1665,6 @@
hint.fd.1.drive="1"
#
-# sio: serial ports (see sio(4)), including support for various
-# PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf)
-#
-device sio
-hint.sio.0.at="isa"
-hint.sio.0.port="0x3F8"
-hint.sio.0.flags="0x10"
-hint.sio.0.irq="4"
-
-# Options for sio:
-options COM_ESP # Code for Hayes ESP.
-options COM_MULTIPORT # Code for some cards with shared IRQs.
-options CONSPEED=115200 # Speed for serial console
- # (default 9600).
-
-# `flags' specific to sio(4). See below for flags used by both sio(4) and
-# uart(4).
-# 0x20 force this unit to be the console (unless there is another
-# higher priority console). This replaces the COMCONSOLE option.
-# 0x40 reserve this unit for low level console operations. Do not
-# access the device in any normal way.
-# PnP `flags'
-# 0x1 disable probing of this device. Used to prevent your modem
-# from being attached as a PnP modem.
-# Other flags for sio that aren't documented in the man page.
-# 0x20000 enable hardware RTS/CTS and larger FIFOs. Only works for
-# ST16650A-compatible UARTs.
-
-#
# uart: newbusified driver for serial interfaces. It consolidates the sio(4),
# sab(4) and zs(4) drivers.
#
@@ -1670,16 +1709,14 @@
# Sun servers by the Remote Console.
options ALT_BREAK_TO_DEBUGGER
+# Serial Communications Controller
+# Supports the Siemens SAB 82532 and Zilog Z8530 multi-channel
+# communications controllers.
+device scc
+
# PCI Universal Communications driver
-# Supports various single and multi port PCI serial cards. Maybe later
-# also the parallel ports on combination serial/parallel cards. New cards
-# can be added in src/sys/dev/puc/pucdata.c.
-#
-# If the PUC_FASTINTR option is used the driver will try to use fast
-# interrupts. The card must then be the only user of that interrupt.
-# Interrupts cannot be shared when using PUC_FASTINTR.
+# Supports various multi port PCI I/O cards.
device puc
-options PUC_FASTINTR
#
# Network interfaces:
@@ -1697,6 +1734,9 @@
# PCI and ISA varieties.
# awi: Support for IEEE 802.11 PC Card devices using the AMD Am79C930 and
# Harris (Intersil) Chipset with PCnetMobile firmware by AMD.
+# bce: Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet
+# adapters.
+# bfe: Broadcom BCM4401 Ethernet adapter.
# bge: Support for gigabit ethernet adapters based on the Broadcom
# BCM570x family of controllers, including the 3Com 3c996-T,
# the Netgear GA302T, the SysKonnect SK-9D21 and SK-9D41, and
@@ -1704,7 +1744,6 @@
# cm: Arcnet SMC COM90c26 / SMC COM90c56
# (and SMC COM90c66 in '56 compatibility mode) adapters.
# cnw: Xircom CNW/Netware Airsurfer PC Card adapter
-# cs: IBM Etherjet and other Crystal Semi CS89x0-based adapters
# dc: Support for PCI fast ethernet adapters based on the DEC/Intel 21143
# and various workalikes including:
# the ADMtek AL981 Comet and AN985 Centaur, the ASIX Electronics
@@ -1727,21 +1766,29 @@
# fpa: Support for the Digital DEFPA PCI FDDI. `device fddi' is also needed.
# fxp: Intel EtherExpress Pro/100B
# (hint of prefer_iomap can be done to prefer I/O instead of Mem mapping)
+# gem: Apple GMAC/Sun ERI/Sun GEM
# hme: Sun HME (Happy Meal Ethernet)
# le: AMD Am7900 LANCE and Am79C9xx PCnet
# lge: Support for PCI gigabit ethernet adapters based on the Level 1
# LXT1001 NetCellerator chipset. This includes the D-Link DGE-500SX,
# SMC TigerCard 1000 (SMC9462SX), and some Addtron cards.
+# msk: Support for gigabit ethernet adapters based on the Marvell/SysKonnect
+# Yukon II Gigabit controllers, including 88E8021, 88E8022, 88E8061,
+# 88E8062, 88E8035, 88E8036, 88E8038, 88E8050, 88E8052, 88E8053,
+# 88E8055, 88E8056 and D-Link 560T/550SX.
+# lmc: Support for the LMC/SBE wide-area network interface cards.
# my: Myson Fast Ethernet (MTD80X, MTD89X)
# nge: Support for PCI gigabit ethernet adapters based on the National
# Semiconductor DP83820 and DP83821 chipset. This includes the
# SMC EZ Card 1000 (SMC9462TX), D-Link DGE-500T, Asante FriendlyNet
-# GigaNIX 1000TA and 1000TPC, the Addtron AEG320T, the LinkSys
-# EG1032 and EG1064, the Surecom EP-320G-TX and the Netgear GA622T.
+# GigaNIX 1000TA and 1000TPC, the Addtron AEG320T, the Surecom
+# EP-320G-TX and the Netgear GA622T.
# pcn: Support for PCI fast ethernet adapters based on the AMD Am79c97x
-# chipsets, including the PCnet/FAST, PCnet/FAST+, PCnet/PRO and
-# PCnet/Home. These were previously handled by the lnc driver (and
-# still will be if you leave this driver out of the kernel).
+# PCnet-FAST, PCnet-FAST+, PCnet-FAST III, PCnet-PRO and PCnet-Home
+# chipsets. These can also be handled by the le(4) driver if the
+# pcn(4) driver is left out of the kernel. The le(4) driver does not
+# support the additional features like the MII bus and burst mode of
+# the PCnet-FAST and greater chipsets though.
# rl: Support for PCI fast ethernet adapters based on the RealTek 8129/8139
# chipset. Note that the RealTek driver defaults to using programmed
# I/O to do register accesses because memory mapped mode seems to cause
@@ -1768,10 +1815,13 @@
# SMC91C90/92/94/95 chips.
# ste: Sundance Technologies ST201 PCI fast ethernet controller, includes
# the D-Link DFE-550TX.
+# stge: Support for gigabit ethernet adapters based on the Sundance/Tamarack
+# TC9021 family of controllers, including the Sundance ST2021/ST2023,
+# the Sundance/Tamarack TC9021, the D-Link DL-4000 and ASUS NX1101.
# ti: Support for PCI gigabit ethernet NICs based on the Alteon Networks
# Tigon 1 and Tigon 2 chipsets. This includes the Alteon AceNIC, the
# 3Com 3c985, the Netgear GA620 and various others. Note that you will
-# probably want to bump up NMBCLUSTERS a lot to use this driver.
+# probably want to bump up kern.ipc.nmbclusters a lot to use this driver.
# tl: Support for the Texas Instruments TNETE100 series 'ThunderLAN'
# cards and integrated ethernet controllers. This includes several
# Compaq Netelligent 10/100 cards and the built-in ethernet controllers
@@ -1807,9 +1857,6 @@
hint.cm.0.port="0x2e0"
hint.cm.0.irq="9"
hint.cm.0.maddr="0xdc000"
-device cs
-hint.cs.0.at="isa"
-hint.cs.0.port="0x300"
device ep
device ex
device fe
@@ -1827,17 +1874,26 @@
device xe
# PCI Ethernet NICs that use the common MII bus controller code.
+device bce # Broadcom BCM5706/BCM5708 Gigabit Ethernet
+device bfe # Broadcom BCM440x 10/100 Ethernet
+device bge # Broadcom BCM570xx Gigabit Ethernet
+device cxgb # Chelsio T3 10 Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
hint.fxp.0.prefer_iomap="0"
+device gem # Apple GMAC/Sun ERI/Sun GEM
device hme # Sun HME (Happy Meal Ethernet)
+device lge # Level 1 LXT1001 gigabit Ethernet
device my # Myson Fast Ethernet (MTD80X, MTD89X)
+device nge # NatSemi DP83820 gigabit Ethernet
device rl # RealTek 8129/8139
device pcn # AMD Am79C97x PCI 10/100 NICs
device sf # Adaptec AIC-6915 (``Starfire'')
device sbsh # Granch SBNI16 SHDSL modem
device sis # Silicon Integrated Systems SiS 900/SiS 7016
+device sk # SysKonnect SK-984x & SK-982x gigabit Ethernet
device ste # Sundance ST201 (D-Link DFE-550TX)
+device ti # Alteon Networks Tigon I/II gigabit Ethernet
device tl # Texas Instruments ThunderLAN
device tx # SMC EtherPower II (83c170 ``EPIC'')
device vr # VIA Rhine, Rhine II
@@ -1847,17 +1903,17 @@
# PCI Ethernet NICs.
device de # DEC/Intel DC21x4x (``Tulip'')
device le # AMD Am7900 LANCE and Am79C9xx PCnet
+device mxge # Myricom Myri-10G 10GbE NIC
+device nxge # Neterion Xframe 10GbE Server/Storage Adapter
device txp # 3Com 3cR990 (``Typhoon'')
device vx # 3Com 3c590, 3c595 (``Vortex'')
-# PCI Gigabit & FDDI NICs.
-device bge
-device lge
-device nge
-device sk
-device ti
+# PCI FDDI NICs.
device fpa
+# PCI WAN adapters.
+device lmc
+
# Use "private" jumbo buffers allocated exclusively for the ti(4) driver.
# This option is incompatible with the TI_JUMBO_HDRSPLIT option below.
#options TI_PRIVATE_JUMBOS
@@ -1943,11 +1999,16 @@
# 4281)
# snd_ds1: Yamaha DS-1 PCI.
# snd_emu10k1: Creative EMU10K1 PCI and EMU10K2 (Audigy) PCI.
+# snd_emu10kx: Creative SoundBlaster Live! and Audigy
+# snd_envy24: VIA Envy24 and compatible, needs snd_spicds.
+# snd_envy24ht: VIA Envy24HT and compatible, needs snd_spicds.
# snd_es137x: Ensoniq AudioPCI ES137x PCI.
# snd_ess: Ensoniq ESS ISA PnP/non-PnP, to be used in
# conjunction with snd_sbc.
# snd_fm801: Forte Media FM801 PCI.
# snd_gusc: Gravis UltraSound ISA PnP/non-PnP.
+# snd_hda: Intel High Definition Audio (Controller) and
+# compatible.
# snd_ich: Intel ICH PCI and some more audio controllers
# embedded in a chipset, for example nVidia
# nForce controllers.
@@ -1956,11 +2017,12 @@
# snd_mss: Microsoft Sound System ISA PnP/non-PnP.
# snd_neomagic: Neomagic 256 AV/ZX PCI.
# snd_sb16: Creative SoundBlaster16, to be used in
-# conjuction with snd_sbc.
+# conjunction with snd_sbc.
# snd_sb8: Creative SoundBlaster (pre-16), to be used in
-# conjuction with snd_sbc.
+# conjunction with snd_sbc.
# snd_sbc: Creative SoundBlaster ISA PnP/non-PnP.
# Supports ESS and Avance ISA chips as well.
+# snd_spicds: SPI codec driver, needed by Envy24/Envy24HT drivers.
# snd_solo: ESS Solo-1x PCI.
# snd_t4dwave: Trident 4DWave DX/NX PCI, Sis 7018 PCI and Acer Labs
# M5451 PCI.
@@ -1979,10 +2041,14 @@
device snd_csa
device snd_ds1
device snd_emu10k1
+device snd_emu10kx
+device snd_envy24
+device snd_envy24ht
device snd_es137x
device snd_ess
device snd_fm801
device snd_gusc
+device snd_hda
device snd_ich
device snd_maestro
device snd_maestro3
@@ -1992,13 +2058,14 @@
device snd_sb8
device snd_sbc
device snd_solo
+device snd_spicds
device snd_t4dwave
device snd_via8233
device snd_via82c686
device snd_vibes
device snd_uaudio
-# For non-pnp sound cards:
+# For non-PnP sound cards:
hint.pcm.0.at="isa"
hint.pcm.0.irq="10"
hint.pcm.0.drq="1"
@@ -2016,13 +2083,17 @@
#
# IEEE-488 hardware:
-# pcii: PCIIA cards (uPD7210 based isa cards)
+# pcii: PCIIA cards (uPD7210 based isa cards)
+# tnt4882: National Instruments PCI-GPIB card.
+
device pcii
hint.pcii.0.at="isa"
hint.pcii.0.port="0x2e1"
hint.pcii.0.irq="5"
hint.pcii.0.drq="1"
+device tnt4882
+
#
# Miscellaneous hardware:
#
@@ -2034,7 +2105,6 @@
# rc: RISCom/8 multiport card
# rp: Comtrol Rocketport(ISA/PCI) - single card
# si: Specialix SI/XIO 4-32 port terminal multiplexor
-# nmdm: nullmodem terminal driver (see nmdm(4))
# Notes on the Comtrol Rocketport driver:
#
@@ -2075,7 +2145,7 @@
device scd
hint.scd.0.at="isa"
hint.scd.0.port="0x230"
-device joy # PnP aware, hints for nonpnp only
+device joy # PnP aware, hints for non-PnP only
hint.joy.0.at="isa"
hint.joy.0.port="0x201"
device rc
@@ -2090,7 +2160,6 @@
hint.si.0.at="isa"
hint.si.0.maddr="0xd0000"
hint.si.0.irq="12"
-device nmdm
#
# The 'bktr' device is a PCI video capture device using the Brooktree
@@ -2155,9 +2224,8 @@
#
# PC Card/PCMCIA and Cardbus
-# (NEWCARD)
#
-# pccbb: pci/cardbus bridge implementing YENTA interface
+# cbb: pci/cardbus bridge implementing YENTA interface
# pccard: pccard slots
# cardbus: cardbus slots
device cbb
@@ -2165,6 +2233,14 @@
device cardbus
#
+# MMC/SD
+#
+# mmc: mmc bus
+# mmcsd: mmc memory and sd cards.
+#device mmc
+#device mmcsd
+
+#
# SMB bus
#
# System Management Bus support is provided by the 'smbus' device.
@@ -2172,7 +2248,7 @@
# which is a child of the 'smbus' device.
#
# Supported devices:
-# smb standard io through /dev/smb*
+# smb standard I/O through /dev/smb*
#
# Supported SMB interfaces:
# iicsmb I2C to SMB bridge with any iicbus interface
@@ -2182,7 +2258,9 @@
# ichsmb Intel ICH SMBus controller chips (82801AA, 82801AB, 82801BA)
# viapm VIA VT82C586B/596B/686A and VT8233 Power Management Unit
# amdpm AMD 756 Power Management Unit
+# amdsmb AMD 8111 SMBus 2.0 Controller
# nfpm NVIDIA nForce Power Management Unit
+# nfsmb NVIDIA nForce2/3/4 MCP SMBus 2.0 Controller
#
device smbus # Bus support, required for smb below.
@@ -2191,7 +2269,9 @@
device ichsmb
device viapm
device amdpm
+device amdsmb
device nfpm
+device nfsmb
device smb
@@ -2314,6 +2394,8 @@
device ohci
# EHCI controller
device ehci
+# SL811 Controller
+device slhci
# General USB code (mandatory for USB)
device usb
#
@@ -2337,19 +2419,23 @@
device umodem
# USB mouse
device ums
-# Diamond Rio 500 Mp3 player
+# Diamond Rio 500 MP3 player
device urio
# USB scanners
device uscanner
#
# USB serial support
device ucom
+# USB support for Technologies ARK3116 based serial adapters
+device uark
# USB support for Belkin F5U103 and compatible serial adapters
device ubsa
# USB support for BWCT console serial adapters
device ubser
# USB support for serial adapters based on the FT8U100AX and FT8U232AM
device uftdi
+# USB support for some Windows CE based serial communication.
+device uipaq
# USB support for Prolific PL-2303 serial adapters
device uplcom
# USB Visor and Palm devices
@@ -2417,7 +2503,7 @@
device sbp # SCSI over Firewire (Requires scbus and da)
device sbp_targ # SBP-2 Target mode (Requires scbus and targ)
device fwe # Ethernet over FireWire (non-standard!)
-device fwip # IP over FireWire (rfc2734 and rfc3146)
+device fwip # IP over FireWire (RFC2734 and RFC3146)
#####################################################################
# dcons support (Dumb Console Device)
@@ -2432,12 +2518,12 @@
#####################################################################
# crypto subsystem
#
-# This is a port of the openbsd crypto framework. Include this when
-# configuring FAST_IPSEC and when you have a h/w crypto device to accelerate
-# user applications that link to openssl.
+# This is a port of the OpenBSD crypto framework. Include this when
+# configuring IPSEC and when you have a h/w crypto device to accelerate
+# user applications that link to OpenSSL.
#
-# Drivers are ports from openbsd with some simple enhancements that have
-# been fed back to openbsd.
+# Drivers are ports from OpenBSD with some simple enhancements that have
+# been fed back to OpenBSD.
device crypto # core crypto support
device cryptodev # /dev/crypto for access to h/w
@@ -2463,9 +2549,17 @@
# Debug options
options BUS_DEBUG # enable newbus debugging
-options DEBUG_VFS_LOCKS # enable vfs lock debugging
+options DEBUG_VFS_LOCKS # enable VFS lock debugging
options SOCKBUF_DEBUG # enable sockbuf last record/mb tail checking
+#
+# Verbose SYSINIT
+#
+# Make the SYSINIT process performed by mi_startup() verbose. This is very
+# useful when porting to a new architecture. If DDB is also enabled, this
+# will print function names instead of addresses.
+options VERBOSE_SYSINIT
+
#####################################################################
# SYSV IPC KERNEL PARAMETERS
#
@@ -2558,8 +2652,6 @@
options NBUF=512 # Number of buffer headers
-options NMBCLUSTERS=1024 # Number of mbuf clusters
-
options SCSI_NCR_DEBUG
options SCSI_NCR_MAX_SYNC=10000
options SCSI_NCR_MAX_WIDE=1
@@ -2589,8 +2681,3 @@
##options BKTR_ALLOC_PAGES=(217*4+1)
options BROOKTREE_ALLOC_PAGES=(217*4+1)
options MAXFILES=999
-options NDEVFSINO=1025
-options NDEVFSOVERFLOW=32769
-
-# Yet more undocumented options for linting.
-options VGA_DEBUG
Index: kern.pre.mk
===================================================================
RCS file: /home/cvs/src/sys/conf/kern.pre.mk,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/conf/kern.pre.mk -L sys/conf/kern.pre.mk -u -r1.1.1.1 -r1.2
--- sys/conf/kern.pre.mk
+++ sys/conf/kern.pre.mk
@@ -1,8 +1,13 @@
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.65.2.2 2005/11/07 09:55:47 obrien Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.92 2007/08/08 19:12:06 marcel Exp $
# Part of a unified Makefile for building kernels. This part contains all
# of the definitions that need to be before %BEFORE_DEPEND.
+SRCCONF?= /etc/src.conf
+.if exists(${SRCCONF})
+.include "${SRCCONF}"
+.endif
+
# Can be overridden by makeoptions or /etc/make.conf
KERNEL_KO?= kernel
KERNEL?= kernel
@@ -41,17 +46,21 @@
. endif
.endif
.if ${CC} == "icc"
+C_DIALECT=
NOSTDINC= -X
.else
+C_DIALECT= -std=c99
NOSTDINC= -nostdinc
.endif
-INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S
+INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S
# This hack lets us use the OpenBSD altq code without spamming a new
# include path into contrib'ed source files.
INCLUDES+= -I$S/contrib/altq
+.if make(depend) || make(kernel-depend)
+
# ... and the same for ipfilter
INCLUDES+= -I$S/contrib/ipfilter
@@ -59,7 +68,7 @@
INCLUDES+= -I$S/contrib/pf
# ... and the same for Atheros HAL
-INCLUDES+= -I$S/contrib/dev/ath -I$S/contrib/dev/ath/freebsd
+INCLUDES+= -I$S/dev/ath
# ... and the same for the NgATM stuff
INCLUDES+= -I$S/contrib/ngatm
@@ -67,38 +76,37 @@
# .. and the same for twa
INCLUDES+= -I$S/dev/twa
-CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG}
+# ... and XFS
+INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs
+
+.endif
+
+CFLAGS= ${COPTFLAGS} ${C_DIALECT} ${DEBUG} ${CWARNFLAGS}
CFLAGS+= ${INCLUDES} -D_KERNEL -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h
.if ${CC} != "icc"
CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT}
CFLAGS+= --param inline-unit-growth=100
CFLAGS+= --param large-function-growth=1000
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || \
+ ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "powerpc" || \
+ ${MACHINE_ARCH} == "sparc64"
WERROR?= -Werror
.endif
+.endif
# XXX LOCORE means "don't declare C stuff" not "for locore.s".
ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS}
.if defined(PROFLEVEL) && ${PROFLEVEL} >= 1
.if ${CC} == "icc"
-.error Profiling doesn't work with ICC yet.
-.else
-CFLAGS+= -DGPROF -falign-functions=16
+.error "Profiling doesn't work with icc yet"
.endif
+CFLAGS+= -DGPROF -falign-functions=16
.if ${PROFLEVEL} >= 2
CFLAGS+= -DGPROF4 -DGUPROF
-. if ${CC} == "icc"
-# XXX doesn't work yet
-#PROF= -prof_gen
-. else
-PROF= -finstrument-functions -Wno-inline
-. endif
+PROF= -pg -mprofiler-epilogue
.else
-. if ${CC} == "icc"
-PROF= -p
-. else
PROF= -pg
-. endif
.endif
.endif
DEFINED_PROF= ${PROF}
Index: options.i386
===================================================================
RCS file: /home/cvs/src/sys/conf/options.i386,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/conf/options.i386 -L sys/conf/options.i386 -u -r1.1.1.1 -r1.2
--- sys/conf/options.i386
+++ sys/conf/options.i386
@@ -1,20 +1,20 @@
-# $FreeBSD: src/sys/conf/options.i386,v 1.225 2005/07/02 20:06:42 delphij Exp $
+# $FreeBSD: src/sys/conf/options.i386,v 1.238 2007/07/04 00:18:38 bz Exp $
# Options specific to the i386 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
AUTO_EOI_2 opt_auto_eoi.h
BROKEN_KEYBOARD_RESET opt_reset.h
+COUNT_XINVLTLB_HITS opt_smp.h
+COUNT_IPIS opt_smp.h
DISABLE_PG_G opt_pmap.h
DISABLE_PSE opt_pmap.h
I586_PMC_GUPROF opt_i586_guprof.h
MAXMEM
MPTABLE_FORCE_HTT
+MP_WATCHDOG
PERFMON
PMAP_SHPGPERPROC opt_pmap.h
POWERFAIL_NMI opt_trap.h
-PPC_DEBUG opt_ppc.h
-PPC_PROBE_CHIPSET opt_ppc.h
-MP_WATCHDOG opt_mp_watchdog.h
# Options for emulators. These should only be used at config time, so
# they are handled like options for static filesystems
@@ -24,6 +24,8 @@
COMPAT_LINUX opt_dontuse.h
COMPAT_SVR4 opt_dontuse.h
DEBUG_SVR4 opt_svr4.h
+LINPROCFS opt_dontuse.h
+LINSYSFS opt_dontuse.h
NDISAPI opt_dontuse.h
PECOFF_DEBUG opt_pecoff.h
PECOFF_SUPPORT opt_dontuse.h
@@ -73,6 +75,12 @@
I586_CPU opt_global.h
I686_CPU opt_global.h
+# options for serial support
+COM_ESP opt_sio.h
+COM_MULTIPORT opt_sio.h
+CONSPEED opt_sio.h
+GDBSPEED opt_sio.h
+
VGA_ALT_SEQACCESS opt_vga.h
VGA_DEBUG opt_vga.h
VGA_NO_FONT_LOADING opt_vga.h
@@ -89,30 +97,6 @@
ATKBD_DFLT_KEYMAP opt_atkbd.h
-# pcvt(4) has a bunch of options
-FAT_CURSOR opt_pcvt.h
-PCVT_123GENERIC opt_pcvt.h
-PCVT_24LINESDEF opt_pcvt.h
-PCVT_CTRL_ALT_DEL opt_pcvt.h
-PCVT_GREENSAVER opt_pcvt.h
-PCVT_INHIBIT_NUMLOCK opt_pcvt.h
-PCVT_META_ESC opt_pcvt.h
-PCVT_NO_LED_UPDATE opt_pcvt.h
-PCVT_NSCREENS opt_pcvt.h
-PCVT_NULLCHARS opt_pcvt.h
-PCVT_PRETTYSCRNS opt_pcvt.h
-PCVT_SCANSET opt_pcvt.h
-PCVT_SCREENSAVER opt_pcvt.h
-PCVT_SETCOLOR opt_pcvt.h
-PCVT_SHOWKEYS opt_pcvt.h
-PCVT_SLOW_INTERRUPT opt_pcvt.h
-PCVT_SYSBEEPF opt_pcvt.h
-PCVT_UPDATEFAST opt_pcvt.h
-PCVT_UPDATESLOW opt_pcvt.h
-PCVT_USEKBDSEC opt_pcvt.h
-PCVT_VT220KEYB opt_pcvt.h
-XSERVER opt_pcvt.h
-
# Video spigot
SPIGOT_UNSECURE opt_spigot.h
@@ -152,8 +136,8 @@
# 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
+#XXXBZ#IPR_VJ opt_i4b.h
+#XXXBZ#IPR_LOG opt_i4b.h
# Device options
DEV_APIC opt_apic.h
@@ -161,5 +145,8 @@
ASR_COMPAT opt_asr.h
# Debugging
-KDB_STOP_NMI opt_kdb.h
NPX_DEBUG opt_npx.h
+STOP_NMI opt_cpu.h
+
+# BPF just-in-time compiler
+BPF_JITTER opt_bpf.h
--- /dev/null
+++ sys/conf/files.sun4v
@@ -0,0 +1,104 @@
+# This file tells config what files go into building a kernel,
+# files marked standard are always included.
+#
+# $FreeBSD: src/sys/conf/files.sun4v,v 1.11 2007/07/03 12:13:42 gnn Exp $
+#
+# 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.
+#
+atkbdmap.h optional atkbd_dflt_keymap \
+ compile-with "/usr/sbin/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 "/usr/sbin/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"
+#
+#
+crypto/blowfish/bf_enc.c optional crypto | ipsec
+crypto/des/des_enc.c optional crypto | ipsec | netsmb
+dev/ofw/ofw_bus_if.m standard
+dev/ofw/ofw_bus_subr.c standard
+dev/ofw/ofw_console.c optional ofw_console
+dev/ofw/openfirm.c standard
+dev/ofw/openfirmio.c standard
+dev/ofw/openpromio.c standard
+dev/uart/uart_cpu_sparc64.c optional uart
+kern/syscalls.c optional ktr
+libkern/ffs.c standard
+libkern/ffsl.c standard
+libkern/fls.c standard
+libkern/flsl.c standard
+sparc64/sparc64/autoconf.c standard
+sun4v/sun4v/bus_machdep.c standard
+sparc64/sparc64/clock.c standard
+sparc64/sparc64/counter.c standard
+sparc64/sparc64/db_disasm.c optional ddb
+sun4v/sun4v/db_interface.c optional ddb
+sun4v/sun4v/db_trace.c optional ddb
+sun4v/sun4v/db_hwwatch.c optional ddb
+sun4v/sun4v/dump_machdep.c standard
+sparc64/sparc64/elf_machdep.c standard
+sun4v/sun4v/exception.S standard no-obj
+sparc64/sparc64/gdb_machdep.c optional gdb
+sun4v/sun4v/hv_pci.c optional pci
+sun4v/sun4v/trap_trace.S optional trap_tracing
+sparc64/pci/ofw_pcib.c optional pci
+sparc64/pci/ofw_pcib_subr.c optional pci
+sparc64/pci/ofw_pcibus.c optional pci
+sparc64/pci/ofw_pci_if.m optional pci
+
+# XXX hvcons should be optional
+sun4v/sun4v/hvcons.c standard
+sun4v/sun4v/hcall.S standard
+sun4v/sun4v/hviommu.c standard
+sparc64/sparc64/identcpu.c standard
+sparc64/sparc64/in_cksum.c optional inet
+sun4v/sun4v/interrupt.S standard no-obj
+sun4v/sun4v/intr_machdep.c standard
+sun4v/sun4v/locore.S standard no-obj
+sun4v/sun4v/machdep.c standard
+sparc64/sparc64/mem.c optional mem
+sun4v/sun4v/mp_exception.S optional smp
+sun4v/sun4v/mp_locore.S optional smp
+sun4v/sun4v/mp_machdep.c optional smp
+sun4v/sun4v/nexus.c standard
+sun4v/cddl/t1_copy.S standard
+sparc64/sparc64/ofw_bus.c standard
+sparc64/sparc64/ofw_machdep.c standard
+sun4v/sun4v/pmap.c standard
+sparc64/sparc64/prof_machdep.c optional profiling-routine
+sparc64/sparc64/rwindow.c standard
+sun4v/sun4v/rtc.c standard
+sun4v/sun4v/simdisk.c optional simulator
+sun4v/sun4v/support.S standard
+sparc64/sparc64/sys_machdep.c standard
+sun4v/sun4v/swtch.S standard
+sun4v/sun4v/tsb.c standard
+sun4v/sun4v/tte.c standard
+sun4v/sun4v/tte_hash.c standard
+sun4v/sun4v/tick.c standard
+sun4v/sun4v/trap.c standard
+sun4v/sun4v/uio_machdep.c standard
+sun4v/sun4v/vm_machdep.c standard
+sun4v/sun4v/vnex.c standard
+sun4v/dev/vnet.c optional vnet
+
+
+sun4v/mdesc/mdesc_bus_if.m standard
+sun4v/mdesc/mdesc_init.c standard
+sun4v/mdesc/mdesc_subr.c standard
+sun4v/mdesc/mdesc_bus_subr.c standard
+sun4v/cddl/mdesc/mdesc_findname.c standard
+sun4v/cddl/mdesc/mdesc_getpropstr.c standard
+sun4v/cddl/mdesc/mdesc_getpropval.c standard
+sun4v/cddl/mdesc/mdesc_init_intern.c standard
+sun4v/cddl/mdesc/mdesc_nodecount.c standard
+sun4v/cddl/mdesc/mdesc_findnodeprop.c standard
+sun4v/cddl/mdesc/mdesc_rootnode.c standard
+sun4v/cddl/mdesc/mdesc_scandag.c standard
+sun4v/mdesc/mdesc_vdevfindnode.c standard
+sun4v/mdesc/mdesc_vdevfindval.c standard
Index: Makefile.sparc64
===================================================================
RCS file: /home/cvs/src/sys/conf/Makefile.sparc64,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/conf/Makefile.sparc64 -L sys/conf/Makefile.sparc64 -u -r1.1.1.1 -r1.2
--- sys/conf/Makefile.sparc64
+++ sys/conf/Makefile.sparc64
@@ -1,7 +1,7 @@
# Makefile.sparc64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.33.2.1 2005/10/28 19:04:03 jhb Exp $
+# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.40 2007/05/16 17:23:54 wkoszek Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
--- sys/conf/files.ia64
+++ /dev/null
@@ -1,151 +0,0 @@
-# This file tells config what files go into building a kernel,
-# files marked standard are always included.
-#
-# $FreeBSD: src/sys/conf/files.ia64,v 1.81 2005/06/30 07:49:21 peter Exp $
-#
-# 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"
-#
-atkbdmap.h optional atkbd_dflt_keymap \
- compile-with "/usr/sbin/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"
-#
-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 ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
-#
-ukbdmap.h optional ukbd_dflt_keymap \
- compile-with "/usr/sbin/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"
-#
-compat/freebsd32/freebsd32_misc.c optional compat_ia32
-compat/freebsd32/freebsd32_syscalls.c optional compat_ia32
-compat/freebsd32/freebsd32_sysent.c optional compat_ia32
-compat/ia32/ia32_sysvec.c optional compat_ia32
-contrib/ia64/libuwx/src/uwx_bstream.c standard
-contrib/ia64/libuwx/src/uwx_context.c standard
-contrib/ia64/libuwx/src/uwx_env.c standard
-contrib/ia64/libuwx/src/uwx_scoreboard.c standard
-contrib/ia64/libuwx/src/uwx_step.c standard
-contrib/ia64/libuwx/src/uwx_str.c standard
-contrib/ia64/libuwx/src/uwx_swap.c standard
-contrib/ia64/libuwx/src/uwx_trace.c standard
-contrib/ia64/libuwx/src/uwx_uinfo.c standard
-contrib/ia64/libuwx/src/uwx_utable.c standard
-crypto/blowfish/bf_enc.c optional crypto
-crypto/blowfish/bf_enc.c optional ipsec ipsec_esp
-crypto/des/des_enc.c optional crypto
-crypto/des/des_enc.c optional ipsec ipsec_esp
-crypto/des/des_enc.c optional netsmbcrypto
-dev/advansys/adv_isa.c optional adv isa
-dev/aic/aic_isa.c optional aic isa
-dev/atkbdc/atkbd.c optional atkbd atkbdc
-dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc
-dev/atkbdc/atkbdc.c optional atkbdc
-dev/atkbdc/atkbdc_isa.c optional atkbdc isa
-dev/atkbdc/atkbdc_subr.c optional atkbdc
-dev/atkbdc/psm.c optional psm atkbdc
-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/hwpmc/hwpmc_ia64.c optional hwpmc
-dev/kbd/kbd.c optional atkbd
-dev/kbd/kbd.c optional sc
-dev/kbd/kbd.c optional ukbd
-dev/ppc/ppc.c optional ppc isa
-dev/ppc/ppc_puc.c optional ppc puc
-dev/syscons/schistory.c optional sc
-dev/syscons/scmouse.c optional sc
-dev/syscons/scterm-dumb.c optional sc
-dev/syscons/scterm-sc.c optional sc
-dev/syscons/scterm.c optional sc
-dev/syscons/scvgarndr.c optional sc vga
-dev/syscons/scvidctl.c optional sc
-dev/syscons/scvtb.c optional sc
-dev/syscons/syscons.c optional sc
-dev/syscons/sysmouse.c optional sc
-dev/uart/uart_cpu_ia64.c optional uart
-geom/geom_bsd.c standard
-geom/geom_bsd_enc.c standard
-geom/geom_gpt.c standard
-geom/geom_mbr.c standard
-geom/geom_mbr_enc.c standard
-dev/acpica/acpi_if.m standard
-ia64/acpica/OsdEnvironment.c optional acpi
-ia64/acpica/acpi_machdep.c optional acpi
-ia64/acpica/acpi_wakeup.c optional acpi
-ia64/acpica/madt.c optional acpi
-ia64/disasm/disasm_decode.c standard
-ia64/disasm/disasm_extract.c standard
-ia64/disasm/disasm_format.c standard
-ia64/ia32/ia32_reg.c optional compat_ia32
-ia64/ia32/ia32_signal.c optional compat_ia32
-ia64/ia32/ia32_sigtramp.c optional compat_ia32
-ia64/ia32/ia32_trap.c optional compat_ia32
-ia64/ia64/autoconf.c standard
-ia64/ia64/busdma_machdep.c standard
-ia64/ia64/clock.c standard
-ia64/ia64/context.S standard
-ia64/ia64/db_interface.c optional ddb
-ia64/ia64/db_trace.c optional ddb
-ia64/ia64/dump_machdep.c standard
-ia64/ia64/efi.c standard
-ia64/ia64/elf_machdep.c standard
-ia64/ia64/exception.S standard
-ia64/ia64/gdb_machdep.c optional gdb
-ia64/ia64/in_cksum.c optional inet
-ia64/ia64/interrupt.c standard
-ia64/ia64/locore.S standard no-obj
-ia64/ia64/machdep.c standard
-ia64/ia64/mca.c standard
-ia64/ia64/mem.c optional mem
-ia64/ia64/mp_machdep.c optional smp
-ia64/ia64/nexus.c standard
-ia64/ia64/pal.S standard
-ia64/ia64/pmap.c standard
-ia64/ia64/ptrace_machdep.c standard
-ia64/ia64/sal.c standard
-ia64/ia64/sapic.c standard
-ia64/ia64/setjmp.S standard
-ia64/ia64/ssc.c optional ski
-ia64/ia64/sscdisk.c optional ski
-ia64/ia64/support.S standard
-ia64/ia64/sys_machdep.c standard
-ia64/ia64/syscall.S standard
-ia64/ia64/trap.c standard
-ia64/ia64/uio_machdep.c standard
-ia64/ia64/uma_machdep.c standard
-ia64/ia64/unaligned.c standard
-ia64/ia64/unwind.c standard
-ia64/ia64/vm_machdep.c standard
-ia64/isa/isa.c optional isa
-ia64/isa/isa_dma.c optional isa
-ia64/pci/pci_cfgreg.c optional pci
-isa/syscons_isa.c optional sc
-isa/vga_isa.c optional vga
-kern/imgact_elf32.c optional compat_ia32
-libkern/bcmp.c standard
-libkern/ffsl.c standard
-libkern/fls.c standard
-libkern/flsl.c standard
-libkern/ia64/__divdi3.S standard
-libkern/ia64/__divsi3.S standard
-libkern/ia64/__moddi3.S standard
-libkern/ia64/__modsi3.S standard
-libkern/ia64/__udivdi3.S standard
-libkern/ia64/__udivsi3.S standard
-libkern/ia64/__umoddi3.S standard
-libkern/ia64/__umodsi3.S standard
-libkern/ia64/bswap16.S standard
-libkern/ia64/bswap32.S standard
--- sys/conf/Makefile.arm
+++ /dev/null
@@ -1,64 +0,0 @@
-# Makefile.arm -- with config changes.
-# Copyright 1990 W. Jolitz
-# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.arm,v 1.10.2.1 2005/10/28 19:04:03 jhb Exp $
-#
-# Makefile for FreeBSD
-#
-# This makefile is constructed from a machine description:
-# config machineid
-# Most changes should be made in the machine description
-# /sys/arm/conf/``machineid''
-# after which you should do
-# config machineid
-# Generic makefile changes should be made in
-# /sys/conf/Makefile.arm
-# after which config should be rerun for all machines.
-#
-
-# Which version of config(8) is required.
-%VERSREQ= 600003
-
-# Temporary stuff while we're still embryonic
-NO_MODULES=
-
-STD8X16FONT?= iso
-
-.if !defined(S)
-.if exists(./@/.)
-S= ./@
-.else
-S= ../../..
-.endif
-.endif
-.include "$S/conf/kern.pre.mk"
-
-SYSTEM_LD:= ${SYSTEM_LD:$S/conf/ldscript.$M=ldscript.$M}
-SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscript.$M=ldscript.$M}
-
-.if defined(ARM_BIG_ENDIAN)
-CC += -mbig-endian
-SYSTEM_LD += -EB
-.endif
-
-.if !defined(DEBUG)
-CFLAGS += -mno-apcs-frame
-.endif
-%BEFORE_DEPEND
-
-%OBJS
-
-%FILES.c
-
-%FILES.s
-
-%FILES.m
-
-%CLEAN
-
-ldscript.$M: $S/conf/ldscript.$M
- cat $S/conf/ldscript.$M|sed s/KERNPHYSADDR/${KERNPHYSADDR}/g| \
- sed s/KERNVIRTADDR/${KERNVIRTADDR}/g > ldscript.$M
-%RULES
-
-.include "$S/conf/kern.post.mk"
--- sys/conf/Makefile.ia64
+++ /dev/null
@@ -1,55 +0,0 @@
-# Makefile.ia64 -- with config changes.
-# Copyright 1990 W. Jolitz
-# from: src/sys/conf/Makefile.alpha,v 1.76
-# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.62.2.1 2005/10/28 19:04:03 jhb Exp $
-#
-# Makefile for FreeBSD
-#
-# This makefile is constructed from a machine description:
-# config machineid
-# Most changes should be made in the machine description
-# /sys/ia64/conf/``machineid''
-# after which you should do
-# config machineid
-# Generic makefile changes should be made in
-# /sys/conf/Makefile.ia64
-# after which config should be rerun for all machines.
-#
-
-GCC3= you bet
-
-# Which version of config(8) is required.
-%VERSREQ= 600003
-
-STD8X16FONT?= iso
-
-.if !defined(S)
-.if exists(./@/.)
-S= ./@
-.else
-S= ../../..
-.endif
-.endif
-.include "$S/conf/kern.pre.mk"
-
-INCLUDES+= -I$S/contrib/ia64/libuwx/src
-
-CFLAGS+= -mconstant-gp
-
-ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS}
-
-%BEFORE_DEPEND
-
-%OBJS
-
-%FILES.c
-
-%FILES.s
-
-%FILES.m
-
-%CLEAN
-
-%RULES
-
-.include "$S/conf/kern.post.mk"
--- sys/conf/files.arm
+++ /dev/null
@@ -1,69 +0,0 @@
-# $FreeBSD: src/sys/conf/files.arm,v 1.8 2005/06/09 19:45:07 jkoshy Exp $
-arm/arm/autoconf.c standard
-arm/arm/bcopy_page.S standard
-arm/arm/bcopyinout.S standard
-arm/arm/blockio.S standard
-arm/arm/bootconfig.c standard
-arm/arm/bus_space_asm_generic.S standard
-arm/arm/busdma_machdep.c standard
-arm/arm/copystr.S standard
-arm/arm/cpufunc.c standard
-arm/arm/cpufunc_asm.S standard
-arm/arm/cpufunc_asm_sa1.S standard
-arm/arm/cpufunc_asm_armv4.S standard
-arm/arm/cpufunc_asm_sa11x0.S standard
-arm/arm/db_disasm.c optional ddb
-arm/arm/db_interface.c optional ddb
-arm/arm/db_trace.c optional ddb
-arm/arm/disassem.c standard
-arm/arm/dump_machdep.c standard
-arm/arm/elf_machdep.c standard
-arm/arm/exception.S standard
-arm/arm/fiq.c standard
-arm/arm/fiq_subr.S standard
-arm/arm/fusu.S standard
-arm/arm/identcpu.c standard
-arm/arm/in_cksum.c standard
-arm/arm/in_cksum_arm.S standard
-arm/arm/intr.c standard
-arm/arm/locore.S standard no-obj
-arm/arm/machdep.c standard
-arm/arm/mem.c optional mem
-arm/arm/nexus.c optional nexus
-arm/arm/nexus_io.c optional nexus
-arm/arm/nexus_io_asm.S optional nexus
-arm/arm/pmap.c standard
-arm/arm/setcpsr.S standard
-arm/arm/setstack.s standard
-arm/arm/support.S standard
-arm/arm/swtch.S standard
-arm/arm/sys_machdep.c standard
-arm/arm/trap.c standard
-arm/arm/uio_machdep.c standard
-arm/arm/undefined.c standard
-arm/arm/vectors.S standard
-arm/arm/vm_machdep.c standard
-arm/fpe-arm/armfpe_glue.S optional armfpe
-arm/fpe-arm/armfpe_init.c optional armfpe
-arm/fpe-arm/armfpe.S optional armfpe
-dev/hwpmc/hwpmc_arm.c optional hwpmc
-geom/geom_bsd.c standard
-geom/geom_bsd_enc.c standard
-geom/geom_mbr.c standard
-geom/geom_mbr_enc.c standard
-libkern/arm/divsi3.S standard
-libkern/arm/ffs.S standard
-libkern/arm/muldi3.c standard
-libkern/ashldi3.c standard
-libkern/ashrdi3.c standard
-libkern/divdi3.c standard
-libkern/ffsl.c standard
-libkern/flsl.c standard
-libkern/lshrdi3.c standard
-libkern/moddi3.c standard
-libkern/qdivrem.c standard
-libkern/udivdi3.c standard
-libkern/umoddi3.c standard
-#XXX: We can't use these versions, as strcmp.c is included conf/files
-#libkern/arm/strcmp.S standard
-#libkern/arm/strncmp.S standard
--- /dev/null
+++ sys/conf/Makefile.sun4v
@@ -0,0 +1,49 @@
+# Makefile.sparc64 -- with config changes.
+# Copyright 1990 W. Jolitz
+# from: @(#)Makefile.i386 7.1 5/10/91
+# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.3 2007/05/16 17:23:54 wkoszek Exp $
+#
+# Makefile for FreeBSD
+#
+# This makefile is constructed from a machine description:
+# config machineid
+# Most changes should be made in the machine description
+# /sys/sparc64/conf/``machineid''
+# after which you should do
+# config machineid
+# Generic makefile changes should be made in
+# /sys/conf/Makefile.sparc64
+# after which config should be rerun for all machines.
+#
+
+# Which version of config(8) is required.
+%VERSREQ= 600004
+
+STD8X16FONT?= iso
+
+.if !defined(S)
+.if exists(./@/.)
+S= ./@
+.else
+S= ../../..
+.endif
+.endif
+.include "$S/conf/kern.pre.mk"
+
+MDOBJS= exception.o interrupt.o
+
+%BEFORE_DEPEND
+
+%OBJS
+
+%FILES.c
+
+%FILES.s
+
+%FILES.m
+
+%CLEAN
+
+%RULES
+
+.include "$S/conf/kern.post.mk"
Index: files.amd64
===================================================================
RCS file: /home/cvs/src/sys/conf/files.amd64,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L sys/conf/files.amd64 -L sys/conf/files.amd64 -u -r1.1.1.2 -r1.2
--- sys/conf/files.amd64
+++ sys/conf/files.amd64
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.amd64,v 1.71.2.5 2006/01/26 22:12:31 ambrisko Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.107.2.4.2.1 2008/02/06 03:24:28 scottl Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -53,7 +53,7 @@
no-implicit-rule
opt_ah.h optional ath_hal \
dependency "$S/contrib/dev/ath/public/x86_64-elf.opt_ah.h" \
- compile-with "cp $S/contrib/dev/ath/public/x86_64-elf.opt_ah.h opt_ah.h" \
+ compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/x86_64-elf.opt_ah.h opt_ah.h" \
no-obj no-implicit-rule before-depend \
clean "opt_ah.h"
#
@@ -73,6 +73,12 @@
compile-with "uudecode < $S/dev/hptmv/amd64-elf.raid.o.uu" \
no-implicit-rule
#
+hptrr_lib.o optional hptrr \
+ dependency "$S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \
+ compile-with "uudecode < $S/dev/hptrr/amd64-elf.hptrr_lib.o.uu" \
+ no-implicit-rule
+#
+#
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
amd64/acpica/acpi_wakeup.c optional acpi
@@ -82,6 +88,7 @@
amd64/amd64/atomic.c standard
amd64/amd64/autoconf.c standard
amd64/amd64/bios.c standard
+amd64/amd64/bpf_jit_machdep.c optional bpf_jitter
amd64/amd64/busdma_machdep.c standard
amd64/amd64/cpu_switch.S standard
amd64/amd64/db_disasm.c optional ddb
@@ -103,11 +110,13 @@
amd64/amd64/locore.S standard no-obj
amd64/amd64/machdep.c standard
amd64/amd64/mem.c optional mem
+amd64/amd64/minidump_machdep.c standard
amd64/amd64/mp_machdep.c optional smp
amd64/amd64/mp_watchdog.c optional mp_watchdog smp
amd64/amd64/mpboot.S optional smp
amd64/amd64/mptable.c optional mptable
amd64/amd64/mptable_pci.c optional mptable pci
+amd64/amd64/msi.c optional pci
amd64/amd64/nexus.c standard
amd64/amd64/pmap.c standard
amd64/amd64/prof_machdep.c optional profiling-routine
@@ -128,11 +137,8 @@
amd64/isa/nmi.c standard
amd64/pci/pci_bus.c optional pci
amd64/pci/pci_cfgreg.c optional pci
-crypto/blowfish/bf_enc.c optional crypto
-crypto/blowfish/bf_enc.c optional ipsec ipsec_esp
-crypto/des/des_enc.c optional crypto
-crypto/des/des_enc.c optional ipsec ipsec_esp
-crypto/des/des_enc.c optional netsmbcrypto
+crypto/blowfish/bf_enc.c optional crypto | ipsec
+crypto/des/des_enc.c optional crypto | ipsec | netsmb
dev/acpica/acpi_if.m standard
dev/arcmsr/arcmsr.c optional arcmsr pci
dev/atkbdc/atkbd.c optional atkbd atkbdc
@@ -141,17 +147,30 @@
dev/atkbdc/atkbdc_isa.c optional atkbdc isa
dev/atkbdc/atkbdc_subr.c optional atkbdc
dev/atkbdc/psm.c optional psm atkbdc
-dev/fb/fb.c optional fb
-dev/fb/fb.c optional vga
-dev/fb/splash.c optional splash
+dev/coretemp/coretemp.c optional coretemp
+# There are no systems with isa slots, so all ed isa entries should go..
+dev/ed/if_ed_3c503.c optional ed isa ed_3c503
+dev/ed/if_ed_isa.c optional ed isa
+dev/ed/if_ed_wd80x3.c optional ed isa
+dev/ed/if_ed_hpp.c optional ed isa ed_hpp
+dev/ed/if_ed_sic.c optional ed isa ed_sic
+dev/fb/fb.c optional fb | vga
dev/fb/vga.c optional vga
dev/ichwd/ichwd.c optional ichwd
dev/if_ndis/if_ndis.c optional ndis
dev/if_ndis/if_ndis_pccard.c optional ndis pccard
-dev/if_ndis/if_ndis_pci.c optional ndis cardbus
-dev/if_ndis/if_ndis_pci.c optional ndis pci
+dev/if_ndis/if_ndis_pci.c optional ndis cardbus | ndis pci
dev/if_ndis/if_ndis_usb.c optional ndis usb
dev/io/iodev.c optional io
+dev/ipmi/ipmi.c optional ipmi
+dev/ipmi/ipmi_acpi.c optional ipmi acpi
+dev/ipmi/ipmi_isa.c optional ipmi isa
+dev/ipmi/ipmi_kcs.c optional ipmi
+dev/ipmi/ipmi_smic.c optional ipmi
+dev/ipmi/ipmi_smbus.c optional ipmi smbus
+dev/ipmi/ipmi_smbios.c optional ipmi
+dev/ipmi/ipmi_ssif.c optional ipmi smbus
+dev/ipmi/ipmi_pci.c optional ipmi pci
dev/fdc/fdc.c optional fdc
dev/fdc/fdc_acpi.c optional fdc
dev/fdc/fdc_isa.c optional fdc isa
@@ -161,39 +180,34 @@
dev/hptmv/gui_lib.c optional hptmv
dev/hptmv/hptproc.c optional hptmv
dev/hptmv/ioctl.c optional hptmv
+dev/hptrr/hptrr_os_bsd.c optional hptrr
+dev/hptrr/hptrr_osm_bsd.c optional hptrr
+dev/hptrr/hptrr_config.c optional hptrr
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
-dev/kbd/kbd.c optional atkbd
-dev/kbd/kbd.c optional sc
-dev/kbd/kbd.c optional ukbd
+dev/kbd/kbd.c optional atkbd | sc | ukbd
dev/mem/memutil.c optional mem
+dev/nfe/if_nfe.c optional nfe pci
dev/nve/if_nve.c optional nve pci
-dev/ppc/ppc.c optional ppc
-dev/ppc/ppc_puc.c optional ppc puc
+dev/nvram/nvram.c optional nvram isa
dev/sio/sio.c optional sio
dev/sio/sio_isa.c optional sio isa
+dev/sio/sio_pccard.c optional sio pccard
+dev/sio/sio_pci.c optional sio pci
+dev/sio/sio_puc.c optional sio puc
dev/speaker/spkr.c optional speaker
dev/syscons/apm/apm_saver.c optional apm_saver apm
-dev/syscons/schistory.c optional sc
-dev/syscons/scmouse.c optional sc
-dev/syscons/scterm-dumb.c optional sc
dev/syscons/scterm-sc.c optional sc
-dev/syscons/scterm.c optional sc
dev/syscons/scvgarndr.c optional sc vga
-dev/syscons/scvidctl.c optional sc
dev/syscons/scvtb.c optional sc
-dev/syscons/syscons.c optional sc
-dev/syscons/sysmouse.c optional sc
dev/uart/uart_cpu_amd64.c optional uart
-geom/geom_bsd.c standard
-geom/geom_bsd_enc.c standard
-geom/geom_mbr.c standard
-geom/geom_mbr_enc.c standard
+dev/wpi/if_wpi.c optional wpi
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
kern/link_elf_obj.c standard
pci/agp_amd64.c optional agp
+pci/agp_i810.c optional agp
pci/agp_intel.c optional agp
#
# IA32 binary support
@@ -207,6 +221,8 @@
compat/freebsd32/freebsd32_syscalls.c optional compat_ia32
compat/freebsd32/freebsd32_sysent.c optional compat_ia32
compat/ia32/ia32_sysvec.c optional compat_ia32
+compat/linprocfs/linprocfs.c optional linprocfs
+compat/linsysfs/linsysfs.c optional linsysfs
kern/imgact_elf32.c optional compat_ia32
#
# Linux/i386 binary support
@@ -215,9 +231,13 @@
amd64/linux32/linux32_locore.s optional compat_linux32 \
dependency "linux32_assym.h"
amd64/linux32/linux32_machdep.c optional compat_linux32
+amd64/linux32/linux32_support.s optional compat_linux32 \
+ dependency "linux32_assym.h"
amd64/linux32/linux32_sysent.c optional compat_linux32
amd64/linux32/linux32_sysvec.c optional compat_linux32
+compat/linux/linux_emul.c optional compat_linux32
compat/linux/linux_file.c optional compat_linux32
+compat/linux/linux_futex.c optional compat_linux32
compat/linux/linux_getcwd.c optional compat_linux32
compat/linux/linux_ioctl.c optional compat_linux32
compat/linux/linux_ipc.c optional compat_linux32
@@ -227,10 +247,12 @@
compat/linux/linux_socket.c optional compat_linux32
compat/linux/linux_stats.c optional compat_linux32
compat/linux/linux_sysctl.c optional compat_linux32
+compat/linux/linux_time.c optional compat_linux32
compat/linux/linux_uid16.c optional compat_linux32
compat/linux/linux_util.c optional compat_linux32
-#
dev/amr/amr_linux.c optional compat_linux32 amr
+dev/mfi/mfi_linux.c optional compat_linux32 mfi
+#
# Windows NDIS driver support
#
compat/ndis/kern_ndis.c optional ndisapi pci
@@ -242,4 +264,9 @@
compat/ndis/subr_usbd.c optional ndisapi pci
compat/ndis/winx64_wrap.S optional ndisapi pci
i386/bios/smbios.c optional smbios
+i386/bios/vpd.c optional vpd
i386/cpufreq/powernow.c optional cpufreq
+i386/cpufreq/est.c optional cpufreq
+i386/cpufreq/p4tcc.c optional cpufreq
+#
+libkern/memset.c standard
Index: Makefile.i386
===================================================================
RCS file: /home/cvs/src/sys/conf/Makefile.i386,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/conf/Makefile.i386 -L sys/conf/Makefile.i386 -u -r1.2 -r1.3
--- sys/conf/Makefile.i386
+++ sys/conf/Makefile.i386
@@ -1,10 +1,9 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.i386,v 1.265.2.1 2005/10/28 19:04:03 jhb Exp $
-# $MidnightBSD$
+# $FreeBSD: src/sys/conf/Makefile.i386,v 1.273 2007/05/16 17:23:53 wkoszek Exp $
#
-# Makefile for MidnightBSD
+# Makefile for FreeBSD
#
# This makefile is constructed from a machine description:
# config machineid
@@ -18,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
@@ -31,7 +30,9 @@
.endif
.include "$S/conf/kern.pre.mk"
-MKMODULESENV+= MACHINE=i386
+MACHINE=i386
+
+MKMODULESENV+= MACHINE=${MACHINE}
%BEFORE_DEPEND
Index: options.sparc64
===================================================================
RCS file: /home/cvs/src/sys/conf/options.sparc64,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/conf/options.sparc64 -L sys/conf/options.sparc64 -u -r1.1.1.1 -r1.2
--- sys/conf/options.sparc64
+++ sys/conf/options.sparc64
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.sparc64,v 1.13 2005/06/10 20:58:59 marius Exp $
+# $FreeBSD: src/sys/conf/options.sparc64,v 1.14 2006/11/02 00:01:15 marius Exp $
SUN4U opt_global.h
@@ -18,3 +18,5 @@
PSM_DEBUG opt_psm.h
PSM_HOOKRESUME opt_psm.h
PSM_RESETAFTERSUSPEND opt_psm.h
+SUNKBD_DFLT_KEYMAP opt_sunkbd.h
+SUNKBD_EMULATE_ATKBD opt_sunkbd.h
--- sys/conf/ldscript.ia64
+++ /dev/null
@@ -1,148 +0,0 @@
-/* $FreeBSD: src/sys/conf/ldscript.ia64,v 1.12 2004/08/25 07:43:28 marcel Exp $ */
-OUTPUT_FORMAT("elf64-ia64-little", "elf64-ia64-little", "elf64-ia64-little")
-OUTPUT_ARCH(ia64)
-ENTRY(__start)
-SEARCH_DIR(/usr/lib);
-kernel_text = 0xe000000004000000;
-SECTIONS
-{
- /* Read-only sections, merged into text segment: */
- . = kernel_text + 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) }
- .rela.init : { *(.rela.init) }
- .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) }
- .rela.fini : { *(.rela.fini) }
- .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) }
- .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) }
- .rela.ctors : { *(.rela.ctors) }
- .rela.dtors : { *(.rela.dtors) }
- .rela.got : { *(.rela.got) }
- .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) }
- .rela.sbss : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) }
- .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) }
- .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
- .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
- .rela.plt : { *(.rela.plt) }
- .rela.IA_64.pltoff : { *(.rela.IA_64.pltoff) }
- PROVIDE (btext = .);
- .init :
- {
- *(.init)
- } =0x00300000010070000002000001000400
- .plt : { *(.plt) }
- .text :
- {
- *(.text .stub .text.* .gnu.linkonce.t.*)
- /* .gnu.warning sections are handled specially by elf32.em. */
- *(.gnu.warning)
- } =0x00300000010070000002000001000400
- .fini :
- {
- *(.fini)
- } =0x00300000010070000002000001000400
- _etext = .;
- PROVIDE (etext = .);
- .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
- .rodata1 : { *(.rodata1) }
- .sdata2 : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) }
- .sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
- .opd : { *(.opd) }
- .IA_64.unwind_info : { *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) }
- .IA_64.unwind : { *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) }
- /* Adjust the address for the data segment. We want to adjust up to
- the same address within the page on the next page up. */
- . = . + 8192;
- .data :
- {
- *(.data.proc0 .data .data.* .gnu.linkonce.d.*)
- SORT(CONSTRUCTORS)
- }
- .data1 : { *(.data1) }
- .dynamic : { *(.dynamic) }
- .ctors :
- {
- *(.ctors)
- *(SORT(.ctors.*))
- }
- .dtors :
- {
- *(.dtors)
- *(SORT(.dtors.*))
- }
- . = ALIGN(16);
- __gp = . + 0x200000;
- .got : { *(.got.plt) *(.got) }
- .IA_64.pltoff : { *(.IA_64.pltoff) }
- /* 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 .sdata.* .gnu.linkonce.s.*)
- }
- _edata = .;
- PROVIDE (edata = .);
- __bss_start = .;
- .sbss :
- {
- PROVIDE (__sbss_start = .);
- PROVIDE (___sbss_start = .);
- *(.dynsbss)
- *(.sbss .sbss.* .gnu.linkonce.sb.*)
- *(.scommon)
- PROVIDE (__sbss_end = .);
- PROVIDE (___sbss_end = .);
- }
- .bss :
- {
- *(.dynbss)
- *(.bss .bss.* .gnu.linkonce.b.*)
- *(COMMON)
- /* Align here to ensure that the .bss section occupies space up to
- _end. Align after .bss to ensure correct alignment even if the
- .bss section disappears because there are no input sections. */
- . = ALIGN(64 / 8);
- }
- . = 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 .gnu.linkonce.wi.*) }
- .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) }
-}
Index: kmod.mk
===================================================================
RCS file: /home/cvs/src/sys/conf/kmod.mk,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L sys/conf/kmod.mk -L sys/conf/kmod.mk -u -r1.1.1.2 -r1.2
--- sys/conf/kmod.mk
+++ sys/conf/kmod.mk
@@ -1,5 +1,5 @@
# From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/sys/conf/kmod.mk,v 1.192.2.4 2006/02/23 02:13:31 mlaier Exp $
+# $FreeBSD: src/sys/conf/kmod.mk,v 1.219 2007/07/11 01:20:37 marcel Exp $
#
# The include file <bsd.kmod.mk> handles building and installing loadable
# kernel modules.
@@ -38,6 +38,10 @@
#
# FIRMWS List of firmware images in format filename:shortname:version
#
+# FIRMWARE_LICENSE
+# Set to the name of the license the user has to agree on in
+# order to use this firmware. See /usr/share/doc/legal
+#
# DESTDIR The tree where the module gets installed. [not set]
#
# +++ targets +++
@@ -75,7 +79,7 @@
. if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing)
CFLAGS+= -fno-strict-aliasing
. endif
-WERROR?= -Werror
+#WERROR?= -Werror
.endif
CFLAGS+= ${WERROR}
CFLAGS+= -D_KERNEL
@@ -85,9 +89,11 @@
.if ${CC} == "icc"
NOSTDINC= -X
.else
+C_DIALECT= -std=c99
NOSTDINC= -nostdinc
.endif
-CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*}
+CFLAGS+= ${C_DIALECT}
+CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*}
.if defined(KERNBUILDDIR)
CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h
.endif
@@ -101,22 +107,10 @@
# for example.
CFLAGS+= -I@/contrib/altq
-# Add a -I path to standard headers like <stddef.h>. Use a relative
-# path to src/include if possible. If the @ symlink hasn't been built
-# yet, then we can't tell if the relative path exists. Add both the
-# potential relative path and an absolute path in that case.
-.if exists(@)
-.if exists(@/../include)
-CFLAGS+= -I@/../include
-.else
-CFLAGS+= -I${DESTDIR}/usr/include
-.endif
-.else # !@
-CFLAGS+= -I@/../include -I${DESTDIR}/usr/include
-.endif # @
-
.if ${CC} != "icc"
CFLAGS+= -finline-limit=${INLINE_LIMIT}
+CFLAGS+= --param inline-unit-growth=100
+CFLAGS+= --param large-function-growth=1000
.endif
# Disallow common variables, and if we end up with commons from
@@ -141,7 +135,8 @@
.else
${KMOD:S/$/.c/}: @/tools/fw_stub.awk
.endif
- ${AWK} -f @/tools/fw_stub.awk ${FIRMWS} -m${KMOD} -c${KMOD:S/$/.c/g}
+ ${AWK} -f @/tools/fw_stub.awk ${FIRMWS} -m${KMOD} -c${KMOD:S/$/.c/g} \
+ ${FIRMWARE_LICENSE:C/.+/-l/}${FIRMWARE_LICENSE}
SRCS+= ${KMOD:S/$/.c/}
CLEANFILES+= ${KMOD:S/$/.c/}
@@ -150,12 +145,12 @@
${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//}
@${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}}
@if [ -e ${_firmw:C/\:.*$//} ]; then \
- ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} \
- ${_firmw:C/\:.*$//}; \
+ ${LD} -b binary --no-warn-mismatch ${LDFLAGS} \
+ -r -d -o ${.TARGET} ${_firmw:C/\:.*$//}; \
else \
ln -s ${.ALLSRC:M*${_firmw:C/\:.*$//}} ${_firmw:C/\:.*$//}; \
- ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} \
- ${_firmw:C/\:.*$//}; \
+ ${LD} -b binary --no-warn-mismatch ${LDFLAGS} \
+ -r -d -o ${.TARGET} ${_firmw:C/\:.*$//}; \
rm ${_firmw:C/\:.*$//}; \
fi
@@ -173,8 +168,11 @@
FULLPROG= ${PROG}
.else
FULLPROG= ${PROG}.debug
-${PROG}: ${FULLPROG}
- ${OBJCOPY} --strip-debug ${FULLPROG} ${PROG}
+${PROG}: ${FULLPROG} ${PROG}.symbols
+ ${OBJCOPY} --strip-debug --add-gnu-debuglink=${PROG}.symbols\
+ ${FULLPROG} ${.TARGET}
+${PROG}.symbols: ${FULLPROG}
+ ${OBJCOPY} --only-keep-debug ${FULLPROG} ${.TARGET}
.endif
.if ${MACHINE_ARCH} != amd64
@@ -199,7 +197,7 @@
.if defined(EXPORT_SYMS)
.if ${EXPORT_SYMS} != YES
.if ${EXPORT_SYMS} == NO
- touch export_syms
+ :> export_syms
.elif !exists(${.CURDIR}/${EXPORT_SYMS})
echo ${EXPORT_SYMS} > export_syms
.else
@@ -251,12 +249,12 @@
esac ; \
path=`(cd $$path && /bin/pwd)` ; \
${ECHO} ${.TARGET} "->" $$path ; \
- ln -s $$path ${.TARGET}
+ ln -sf $$path ${.TARGET}
-CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS} ${_ILINKS}
+CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS}
.if defined(DEBUG_FLAGS)
-CLEANFILES+= ${FULLPROG}
+CLEANFILES+= ${FULLPROG} ${PROG}.symbols
.endif
.if !target(install)
@@ -266,21 +264,16 @@
_INSTALLFLAGS:= ${_INSTALLFLAGS${ie}}
.endfor
-.if !target(install.debug) && defined(DEBUG_FLAGS)
-install.debug:
- cd ${.CURDIR}; ${MAKE} -DINSTALL_DEBUG install
-.endif
-
.if !target(realinstall)
realinstall: _kmodinstall
.ORDER: beforeinstall _kmodinstall
_kmodinstall:
-.if defined(DEBUG_FLAGS) && defined(INSTALL_DEBUG)
- ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
- ${_INSTALLFLAGS} ${FULLPROG} ${DESTDIR}${KMODDIR}
-.else
${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
${_INSTALLFLAGS} ${PROG} ${DESTDIR}${KMODDIR}
+.if defined(DEBUG_FLAGS) && !defined(INSTALL_NODEBUG)
+ ${INSTALL} -o ${KMODOWN} -g ${KMODGRP} -m ${KMODMODE} \
+ ${_INSTALLFLAGS} ${PROG}.symbols ${DESTDIR}${KMODDIR}
+.endif
.include <bsd.links.mk>
@@ -294,7 +287,6 @@
kldxref ${DESTDIR}${KMODDIR}; \
fi
.endif
-.endif
.endif # !target(realinstall)
.endif # !target(install)
@@ -316,7 +308,7 @@
CLEANFILES+= ${_src}
.if !target(${_src})
${_src}:
- ln -s ${KERNBUILDDIR}/${_src} ${.TARGET}
+ ln -sf ${KERNBUILDDIR}/${_src} ${.TARGET}
.endif
.endfor
.else
@@ -324,21 +316,23 @@
CLEANFILES+= ${_src}
.if !target(${_src})
${_src}:
- touch ${.TARGET}
+ :> ${.TARGET}
.endif
.endfor
.endif
MFILES?= dev/acpica/acpi_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \
dev/iicbus/iicbb_if.m dev/iicbus/iicbus_if.m \
+ dev/mmc/mmcbr_if.m dev/mmc/mmcbus_if.m \
dev/mii/miibus_if.m dev/ofw/ofw_bus_if.m \
dev/pccard/card_if.m dev/pccard/power_if.m dev/pci/pci_if.m \
dev/pci/pcib_if.m dev/ppbus/ppbus_if.m dev/smbus/smbus_if.m \
dev/sound/pcm/ac97_if.m dev/sound/pcm/channel_if.m \
- dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m dev/uart/uart_if.m \
- dev/usb/usb_if.m isa/isa_if.m \
- kern/bus_if.m kern/cpufreq_if.m kern/device_if.m \
- libkern/iconv_converter_if.m opencrypto/crypto_if.m \
+ dev/sound/pcm/feeder_if.m dev/sound/pcm/mixer_if.m \
+ dev/sound/midi/mpu_if.m dev/sound/midi/mpufoi_if.m \
+ dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \
+ kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \
+ libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \
pc98/pc98/canbus_if.m pci/agp_if.m
.for _srcsrc in ${MFILES}
@@ -357,7 +351,7 @@
.endfor # _ext
.endfor # _srcsrc
-.if ${SRCS:Mvnode_if.c} != ""
+.if !empty(SRCS:Mvnode_if.c)
CLEANFILES+= vnode_if.c
.if !exists(@)
vnode_if.c: @
@@ -367,7 +361,7 @@
${AWK} -f @/tools/vnode_if.awk @/kern/vnode_if.src -c
.endif
-.if ${SRCS:Mvnode_if.h} != ""
+.if !empty(SRCS:Mvnode_if.h)
CLEANFILES+= vnode_if.h vnode_if_newproto.h vnode_if_typedef.h
.if !exists(@)
vnode_if.h vnode_if_newproto.h vnode_if_typedef.h: @
@@ -384,7 +378,7 @@
.endif
.for _i in mii pccard
-.if ${SRCS:M${_i}devs.h} != ""
+.if !empty(SRCS:M${_i}devs.h)
CLEANFILES+= ${_i}devs.h
.if !exists(@)
${_i}devs.h: @
@@ -395,7 +389,7 @@
.endif
.endfor # _i
-.if ${SRCS:Musbdevs.h} != ""
+.if !empty(SRCS:Musbdevs.h)
CLEANFILES+= usbdevs.h
.if !exists(@)
usbdevs.h: @
@@ -405,7 +399,7 @@
${AWK} -f @/tools/usbdevs2h.awk @/dev/usb/usbdevs -h
.endif
-.if ${SRCS:Musbdevs_data.h} != ""
+.if !empty(SRCS:Musbdevs_data.h)
CLEANFILES+= usbdevs_data.h
.if !exists(@)
usbdevs_data.h: @
@@ -415,7 +409,7 @@
${AWK} -f @/tools/usbdevs2h.awk @/dev/usb/usbdevs -d
.endif
-.if ${SRCS:Macpi_quirks.h} != ""
+.if !empty(SRCS:Macpi_quirks.h)
CLEANFILES+= acpi_quirks.h
.if !exists(@)
acpi_quirks.h: @
@@ -425,7 +419,7 @@
${AWK} -f @/tools/acpi_quirks2h.awk @/dev/acpica/acpi_quirks
.endif
-.if ${SRCS:Massym.s} != ""
+.if !empty(SRCS:Massym.s)
CLEANFILES+= assym.s genassym.o
assym.s: genassym.o
.if !exists(@)
@@ -447,6 +441,11 @@
.include <bsd.dep.mk>
+cleandepend: cleanilinks
+# .depend needs include links so we remove them only together.
+cleanilinks:
+ rm -f ${_ILINKS}
+
.if !exists(${.OBJDIR}/${DEPENDFILE})
${OBJS}: ${SRCS:M*.h}
.endif
Index: options.amd64
===================================================================
RCS file: /home/cvs/src/sys/conf/options.amd64,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sys/conf/options.amd64 -L sys/conf/options.amd64 -u -r1.1.1.1 -r1.2
--- sys/conf/options.amd64
+++ sys/conf/options.amd64
@@ -1,12 +1,12 @@
-# $FreeBSD: src/sys/conf/options.amd64,v 1.21 2005/06/29 23:23:16 peter Exp $
+# $FreeBSD: src/sys/conf/options.amd64,v 1.29 2007/07/04 00:18:38 bz Exp $
# Options specific to AMD64 platform kernels
AUTO_EOI_1 opt_auto_eoi.h
AUTO_EOI_2 opt_auto_eoi.h
MAXMEM
-PERFMON opt_perfmon.h
+PERFMON
PMAP_SHPGPERPROC opt_pmap.h
-MP_WATCHDOG opt_mp_watchdog.h
+MP_WATCHDOG
# Options for emulators. These should only be used at config time, so
# they are handled like options for static filesystems
@@ -17,12 +17,20 @@
COMPAT_LINUX32 opt_compat.h
#COMPAT_SVR4 opt_dontuse.h
#DEBUG_SVR4 opt_svr4.h
+LINPROCFS opt_dontuse.h
+LINSYSFS opt_dontuse.h
NDISAPI opt_dontuse.h
CLK_CALIBRATION_LOOP opt_clock.h
CLK_USE_I8254_CALIBRATION opt_clock.h
TIMER_FREQ opt_clock.h
+# options for serial support
+COM_ESP opt_sio.h
+COM_MULTIPORT opt_sio.h
+CONSPEED opt_sio.h
+GDBSPEED opt_sio.h
+
VGA_ALT_SEQACCESS opt_vga.h
VGA_DEBUG opt_vga.h
VGA_NO_FONT_LOADING opt_vga.h
@@ -42,19 +50,20 @@
# 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
+#XXXBZ#IPR_VJ opt_i4b.h
+#XXXBZ#IPR_LOG opt_i4b.h
# -------------------------------
# EOF
# -------------------------------
HAMMER opt_cpu.h
-PPC_PROBE_CHIPSET opt_ppc.h
-PPC_DEBUG opt_ppc.h
PSM_HOOKRESUME opt_psm.h
PSM_RESETAFTERSUSPEND opt_psm.h
PSM_DEBUG opt_psm.h
DEV_ATPIC opt_atpic.h
# Debugging
-KDB_STOP_NMI opt_kdb.h
+STOP_NMI opt_cpu.h
+
+# BPF just-in-time compiler
+BPF_JITTER opt_bpf.h
--- sys/conf/ldscript.arm
+++ /dev/null
@@ -1,135 +0,0 @@
-/* $FreeBSD: src/sys/conf/ldscript.arm,v 1.2 2004/09/23 22:52:55 cognet Exp $ */
-OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(_start)
-
-SEARCH_DIR(/usr/lib);
-SECTIONS
-{
- /* Read-only sections, merged into text segment: */
- . = KERNVIRTADDR + 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) }
- . = ALIGN(32 / 8);
- _start_ctors = .;
- PROVIDE (start_ctors = .);
- .ctors :
- {
- *(.ctors)
- }
- _stop_ctors = .;
- PROVIDE (stop_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 . */
-}
More information about the Midnightbsd-cvs
mailing list