xnu-1699.22.73.tar.gz

[apple/xnu.git] / bsd / conf / MASTER.i386

diff --git a/bsd/conf/MASTER.i386 b/bsd/conf/MASTER.i386
index a4504b8a8ad55874f21a96f61f7abcf2da72fb20..594f0fb514fb7bce639267269aca8cef67f33250 100644 (file)
--- a/bsd/conf/MASTER.i386
+++ b/bsd/conf/MASTER.i386
@@ -44,20 +44,20 @@
 #  
 #  Standard Apple Research Configurations:
 #  -------- ----- -------- ---------------
-#  BASE =        [ intel mach medium config_dtrace vol pst gdb kernobjc fixpri simple_clock mdebug kernserv driverkit uxpr kernstack ipc_compat ipc_debug compat_43_tty sysv_sem sysv_msg sysv_shm audit panic_info config_imageboot ]
-#  FILESYS =    [ devfs revfs hfs journaling fdesc config_fse quota namedstreams fifo ffs union cd9660 config_volfs ]
-#  NETWORKING =  [ inet inet6 compat_oldsock mrouting tcpdrop_synfin bpfilter ipdivert netat ipfirewall ipv6firewall ipfw2 dummynet traffic_mgt sendfile netmibs bond vlan gif stf zlib randomipid ifnet_input_chk config_mbuf_jumbo ]
+#  BASE =        [ intel mach medium config_dtrace vol pst gdb kernobjc fixpri simple_clock mdebug kernserv driverkit uxpr kernstack ipc_compat ipc_debug sysv_sem sysv_msg sysv_shm audit panic_info config_imageboot config_workqueue psynch zleaks ]
+#  FILESYS =    [ devfs revfs hfs journaling fdesc config_fse quota namedstreams fifo config_volfs config_hfs_trim hfs_compression config_hfs_alloc_rbtree config_imgsrc_access config_triggers ]
+#  NETWORKING =  [ inet inet6 compat_oldsock tcpdrop_synfin bpfilter ipdivert ipfirewall ipv6firewall ipfw2 dummynet traffic_mgt sendfile bond vlan gif stf zlib randomipid ifnet_input_chk config_mbuf_jumbo if_bridge pf pflog pf_pkthdr ]
 #  NFS =         [ nfsclient nfsserver ]
 #  VPN =         [ ipsec ]
 #  RELEASE =     [ BASE NETWORKING NFS VPN FILESYS libdriver ]
 #  PROFILE =     [ RELEASE profile ]
 #  DEBUG =       [ BASE NETWORKING NFS VPN FILESYS libdriver_g debug xpr_debug mach_assert ]
 #
-#  EMBEDDED_BASE =     [ intel mach bsmall vol pst gdb kernobjc fixpri simple_clock mdebug kernserv driverkit uxpr kernstack ipc_compat ipc_debug compat_43_tty sysv_sem sysv_msg sysv_shm audit panic_info config_imageboot ]
+#  EMBEDDED_BASE =     [ intel mach bsmall vol pst gdb kernobjc fixpri simple_clock mdebug kernserv driverkit uxpr kernstack ipc_compat ipc_debug sysv_sem sysv_msg sysv_shm audit panic_info config_imageboot config_workqueue psynch ]
 #  EMBEDDED_FILESYS =  [ devfs hfs journaling fdesc fifo ]
-#  EMBEDDED_NET =      [ inet compat_oldsock mrouting tcpdrop_synfin bpfilter config_mbuf_noexpand ]
+#  EMBEDDED_NET =      [ inet compat_oldsock tcpdrop_synfin bpfilter ]
 #  EMBEDDED =          [ EMBEDDED_BASE EMBEDDED_NET VPN EMBEDDED_FILESYS libdriver no_printf_str no_kprintf_str no_kdebug ]
-#  DEVELOPMENT =       [ EMBEDDED_BASE EMBEDDED_NET NFS VPN EMBEDDED_FILESYS libdriver netmibs development mach_assert config_dtrace ]
+#  DEVELOPMENT =       [ EMBEDDED_BASE EMBEDDED_NET NFS VPN EMBEDDED_FILESYS libdriver development mach_assert config_dtrace ]
 #
 ######################################################################
 #
@@ -78,8 +78,10 @@ options              UXPR            # user-level XPR package        # <uxpr>
 config         mach_kernel     swap generic                    # <mach>
 options                EVENT                                           # <event>
 
+options     NO_NESTED_PMAP                  # <no_nested_pmap>
+
 #
-# Note: MAC options must be set in all the bsd/conf, osfmk/conf, and 
+# Note: MAC/AUDIT options must be set in all the bsd/conf, osfmk/conf, and 
 # security/conf MASTER files.
 #
 options                CONFIG_MACF                                     # Mandatory Access Control Framework
@@ -88,10 +90,17 @@ options             CONFIG_MACF_SOCKET_SUBSET       # MAC socket subest (no labels)
 #options       CONFIG_MACF_NET                                 # mbuf
 #options       CONFIG_MACF_DEBUG
 #options       CONFIG_MACF_MACH
+options                CONFIG_AUDIT                    # Kernel auditing 
 
 # app-profiling i.e. pre-heating - off? 
 options   CONFIG_APP_PROFILE=0  
 
+#
+# code decryption... used on i386 for DSMOS
+# must be set in all the bsd/conf and osfmk/conf MASTER files
+#
+options                CONFIG_CODE_DECRYPTION
+
 #
 #  Ipl measurement system
 #