xnu-1456.1.26.tar.gz

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

diff --git a/osfmk/conf/MASTER b/osfmk/conf/MASTER
index 5f7d87d6d6b95594fad0d55cfb34e2657d47ecae..76e39eb65f95e286fb506448b8a06f5f8d0094ea 100644 (file)
--- a/osfmk/conf/MASTER
+++ b/osfmk/conf/MASTER
@@ -141,7 +141,6 @@ options             CONFIG_DTRACE   #               # <config_dtrace>
 # 
 options                MACH_COUNTERS   #               # <debug>
 
-options                UPL_DEBUG       #               # <debug>
 
 ##########################################################
 #
@@ -188,6 +187,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
@@ -222,11 +225,24 @@ 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>
 
 # 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>