xnu-1504.15.3.tar.gz

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

diff --git a/bsd/conf/MASTER b/bsd/conf/MASTER
index ec9ff0940714cc0501776ebf2d6655a06ffd386d..93872ad07b75a9244b2065783a7a85b7099b97e1 100644 (file)
--- a/bsd/conf/MASTER
+++ b/bsd/conf/MASTER
@@ -128,6 +128,7 @@ options             VLAN            #                               # <vlan>
 options                BOND            #                               # <bond>
 options                PF              # Packet Filter                 # <pf>
 options                PF_PKTHDR       # PF tag inside mbuf pkthdr     # <pf_pkthdr>
+options                PKT_PRIORITY    # Packet priority support       # <pkt_priority>
 options                PFLOG           # PF log interface              # <pflog>
 options                IPDIVERT        # Divert sockets (for NAT)      # <ipdivert>
 options                IPFLOW          # IP fast forwarding            # <ipflow>
@@ -143,6 +144,7 @@ options             RANDOM_IP_ID    # random (not sequential) ip ids        # <randomipid>
 options                TCP_DROP_SYNFIN # Drop TCP packets with SYN+FIN set     # <tcpdrop_synfin>
 options                ICMP_BANDLIM    # ICMP bandwidth limiting sysctl
 options                IFNET_INPUT_SANITY_CHK  # allow dlil/ifnet input sanity check # <ifnet_input_chk>
+options                IFNET_ROUTE_REFCNT # count route references to ifnet    # <ifnet_route_refcnt>
 options                SYSV_SEM        # SVID semaphores                       # <sysv_sem>
 options                SYSV_MSG        # SVID messages                         # <sysv_msg>
 options                SYSV_SHM        # SVID shared mem                       # <sysv_shm>
@@ -187,6 +189,7 @@ options             FDESC           # fdesc_fs support              # <fdesc>
 options                DEVFS           # devfs support                 # <devfs>
 options                JOURNALING      # journaling support    # <journaling>
 options                HFS_COMPRESSION # hfs compression       # <hfs_compression>
+options                CONFIG_HFS_TRIM # HFS trims unused blocks       # <config_hfs_trim>
 
 #
 #      file system features
@@ -195,6 +198,7 @@ options             QUOTA           # file system quotas            # <quota>
 options                REV_ENDIAN_FS   # Reverse Endian FS             # <revfs>
 options                NAMEDSTREAMS    # named stream vnop support     # <namedstreams>
 options                CONFIG_VOLFS    # volfs path support (legacy)   # <config_volfs>
+options                CONFIG_IMGSRC_ACCESS # source of imageboot dmg  # <config_imgsrc_access>
 
 #
 # NFS support
@@ -245,6 +249,7 @@ options                     randomipid              # <inet,randomipid>
 
 options                ZLIB            # inflate/deflate support       # <zlib>
 
+
 makeoptions    LIBDRIVER = "libDriver_kern.o"                  # <libdriver>
 makeoptions    LIBOBJC   = "libkobjc.o"                        # <kernobjc>
 
@@ -306,6 +311,9 @@ options   CONFIG_VFS_NAMES=4096             # <medium>
 options   CONFIG_VFS_NAMES=3072                # <small,xsmall>
 options   CONFIG_VFS_NAMES=2048                # <bsmall>
 
+options   CONFIG_MAX_CLUSTERS=8                # <xlarge,large,medium>
+options   CONFIG_MAX_CLUSTERS=4                # <small,xsmall,bsmall>
+
 #
 #  configurable kauth credential related resources 
 #
@@ -409,12 +417,22 @@ options   CONFIG_EMBEDDED                 # <config_embedded>
 #
 options   CONFIG_ENFORCE_SIGNED_CODE           # <config_embedded>
 
+# support dynamic signing of code
+#
+options                CONFIG_DYNAMIC_CODE_SIGNING     # <dynamic_codesigning>
+
 #
 # code decryption... used on embedded for app protection
 # must be set in all the bsd/conf and osfmk/conf MASTER files
 #
 options                CONFIG_CODE_DECRYPTION  # <config_embedded>
 
+#
+# User Content Protection, used on embedded
+#
+
+options                CONFIG_PROTECT  # <config_protect>
+
 
 #
 #  Ethernet (ARP)