X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/2d21ac55c334faf3a56e5634905ed6987fc787d4..6d2010ae8f7a6078e10b361c6962983bab233e0f:/osfmk/conf/MASTER

diff --git a/osfmk/conf/MASTER b/osfmk/conf/MASTER
index 5f7d87d6d..e34f671cb 100644
--- a/osfmk/conf/MASTER
+++ b/osfmk/conf/MASTER
@@ -65,7 +65,7 @@ ident		MACH
 #	option should be on.
 #
 options		MACH_KERNEL
-options		MACH_PAGEMAP
+options		MACH_PAGEMAP	#	<mach_pagemap>
 options		MACH_LOAD
 options		MACH_RT
 options		TASK_SWAPPER	#	<task_swapper_disabled>
@@ -108,6 +108,9 @@ options		MACH_MP_DEBUG	#		# <debug>
 #	operations on each element.
 #
 options		ZONE_DEBUG	#		# <debug>
+
+options		CONFIG_ZLEAKS	# Live zone leak debugging	# <zleaks>
+
 #
 options		ZONE_ALIAS_ADDR	#		# <zone_alias_addr>
 # 
@@ -141,8 +144,6 @@ options		CONFIG_DTRACE	#		# <config_dtrace>
 # 
 options		MACH_COUNTERS	#		# <debug>
 
-options		UPL_DEBUG	# 		# <debug>
-
 ##########################################################
 #
 # This defines configuration options that are normally used only during
@@ -188,6 +189,10 @@ options		CRYPTO                  # <crypto>
 #
 options		HIBERNATION		#		# <hibernation>
 
+# CONFIG_SLEEP - include sleep power state code
+#
+options		CONFIG_SLEEP		#		# <config_sleep>
+
 #
 #  configurable kernel related resources (CONFIG_THREAD_MAX needs to stay in 
 #  sync with bsd/conf/MASTER until we fix the config system... todo XXX
@@ -204,9 +209,6 @@ options   CONFIG_ZONE_MAP_MIN=12582912	# <medium,large,xlarge>
 options   CONFIG_ZONE_MAP_MIN=6291456	# <small,xsmall>
 options   CONFIG_ZONE_MAP_MIN=1048576	# <bsmall>
 
-options   CONFIG_TOKEN_QUEUE_SMALL=1		# <bsmall>
-options   CONFIG_TOKEN_QUEUE_SMALL=0		# <xsmall,small,medium,large,xlarge>
-
 #
 #  configurable kernel - use these options to strip strings from panic
 #  and printf calls.
@@ -222,11 +224,48 @@ options   CONFIG_NO_KPRINTF_STRINGS		# <no_kprintf_str>
 #
 options   CONFIG_EMBEDDED                       # <config_embedded>
 
-#  jettison_kernel_linker - jettison kernel linker after kernel init; don't wait for kextd to launch
-options   CONFIG_JETTISON_KERNEL_LINKER		# <jettison_kernel_linker>
+# only execute signed code. Hang this off config_embedded since there's
+# nothing more appropriate right now
+#
+options   CONFIG_ENFORCE_SIGNED_CODE		# <config_embedded>
+
+# support dynamic signing of code
+#
+options		CONFIG_DYNAMIC_CODE_SIGNING	# <dynamic_codesigning>
 
 # vc_progress_white - make the progress gear white instead of black
 options	  CONFIG_VC_PROGRESS_WHITE		# <vc_progress_white>
 
 # secure_kernel - secure kernel from user programs
 options		SECURE_KERNEL		# <secure_kernel>
+
+#
+# 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>
+
+#
+# Context switched counters 
+#
+options		CONFIG_COUNTERS			# <config_counters>
+
+#
+# Timeshare scheduler implementations
+#
+options		CONFIG_SCHED_TRADITIONAL	# <config_sched_traditional>
+options		CONFIG_SCHED_PROTO		# <config_sched_proto>
+options		CONFIG_SCHED_GRRR		# <config_sched_grrr>
+options		CONFIG_SCHED_FIXEDPRIORITY	# <config_sched_fixedpriority>
+options		CONFIG_SCHED_GRRR_CORE		# <config_sched_grrr,config_sched_fixedpriority>
+
+options		CONFIG_SCHED_IDLE_IN_PLACE		# <config_sched_idle_in_place>
+
+#
+# freeze - support app hibernation, used on embedded
+#
+options		CONFIG_FREEZE	# <freeze>
+
+
+options		CHECK_CS_VALIDATION_BITMAP	# <config_cs_validation_bitmap>
+