X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/55e303ae13a4cf49d70f2294092726f2fffb9ef2..e2fac8b15b12a7979f72090454d850e612fc5b13:/osfmk/conf/MASTER.ppc

diff --git a/osfmk/conf/MASTER.ppc b/osfmk/conf/MASTER.ppc
index 7511c465e..09dfbf8ee 100644
--- a/osfmk/conf/MASTER.ppc
+++ b/osfmk/conf/MASTER.ppc
@@ -9,25 +9,16 @@
 #  Standard Apple MacOS X Configurations:
 #  -------- ---- -------- ---------------
 #
-#  RELEASE       = [ mach_bsd mach_kdp iokit mach_pe ppc mach              ]
+#  RELEASE       = [ medium mach_bsd mach_kdp iokit mach_pe ppc mach hibernation crypto config_dtrace ]
+#  DEVELOPMENT	 = [ RELEASE ]
 #  RELEASE_TRACE = [ RELEASE kdebug ]
-#  DEBUG         = [ RELEASE mach_kdb debug ]
+#  DEBUG         = [ RELEASE mach_kdb debug mach_assert ]
 #  DEBUG_TRACE   = [ DEBUG kdebug ]
 #  PROFILE       = [ RELEASE profile ]
 #
 ######################################################################
 #
 ##############################################################################
-#
-# Statistics and timing options.
-#
-# STAT_TIME indicates that this machine uses a statistical timer for gathering
-#       usage statistics, and has no higher resolution timer to measure actual
-#       intervals.
-#
-options		STAT_TIME
-#options	MACH_MACHINE_ROUTINES
-
 #
 # MACH_PROF enables code for mach profiling.
 #
@@ -42,11 +33,10 @@ options		PROFILE		# kernel profiling	# <profile>
 
 machine		"ppc"
 cpu		"ppc"
-pseudo-device	cpus		2
 pseudo-device	scc		1
 pseudo-device	vc		1
 
-
+options		MACHINE_TIMER_ROUTINES
 
 # Disabled by default, since mklinux does not need this
 # unless running multiserver - the atalk stack at time of
@@ -65,3 +55,12 @@ options		MACH_PE		#		# <mach_pe>
 # XXX for bringup, turns on mac disklabels, 
 # and some other nice stuff for the diskshim
 options		POWERMAC
+
+options		DISPATCH_COUNTS
+
+#
+# Note: MAC options must be set in all the bsd/conf, osfmk/conf, and 
+# security/conf MASTER files.
+#
+options		CONFIG_MACF		# Mandatory Access Control Framework
+#options	CONFIG_MACF_MACH	# MACF applied to Mach services