X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=Config.in;h=d1a6e0b9ae848c3eb785b49ae4068a91915c3fbf;hp=403597804f09089ae01a51f27f6ff9159d2b7d79;hb=c6d2712db35b3bf24a5ecb02a8b6f650c0e3486d;hpb=12b3909f1ba425f76f90685c2446fa45d969b87f

diff --git a/Config.in b/Config.in
index 403597804f..d1a6e0b9ae 100644
--- a/Config.in
+++ b/Config.in
@@ -81,7 +81,8 @@ menu "Target Images"
 	config TARGET_ROOTFS_ISO
 		bool "iso"
 		default n
-		depends TARGET_ROOTFS_INITRAMFS && TARGET_x86
+		depends on TARGET_x86_generic
+		depends !TARGET_ROOTFS_INITRAMFS
 		help
 		  Create some bootable ISO image
 
@@ -193,9 +194,14 @@ menu "Global build settings"
 		  debugging files into. Enable this option to be able to read and
 		  write to these files.
 
+	config KERNEL_PERF_EVENTS
+		bool
+		default n
+
 	config KERNEL_PROFILING
 		bool "Compile the kernel with profiling enabled"
 		default n
+		select KERNEL_PERF_EVENTS
 		help
 		  Enable the extended profiling support mechanisms used by profilers such
 		  as OProfile.
@@ -291,32 +297,38 @@ menu "Global build settings"
 	config PKG_BUILD_PARALLEL
 		bool
 		prompt "Compile certain packages parallelized"
-		default n
+		default y
 		help
 		  This adds a -jX option to certain packages that are known to
-		  behave well for parallel build.
+		  behave well for parallel build. By default the package make processes
+		  use the main jobserver, in which case this option only takes effect
+		  when you add -jX to the make command.
+
+		  If you are unsure, select N.
 
-		  Note that this may overcommit CPU resources depending on the
+	config PKG_BUILD_USE_JOBSERVER
+		bool
+		prompt "Use top-level make jobserver for packages"
+		depends on PKG_BUILD_PARALLEL
+		default y
+		help
+		  This passes the main make process jobserver fds to package builds,
+		  enabling full parallelization across different packages
+
+		  Note that disabling this may overcommit CPU resources depending on the
 		  -j level of the main make process, the number of package
 		  submake jobs selected below and the number of actual CPUs present.
 		  Example: If the main make is passed a -j4 and the submake -j
 		  is also set to 4, we may end up with 16 parallel make processes
 		  in the worst case.
 
-		  You get maximum build performance, if you set the package build
-		  jobs to the number of CPUs (cores) available and also start the main
-		  make process with -jX, where X is the number of CPUs (cores).
-		  However, make sure you have enough RAM available for
-		  NR_CPUS to the power of two (NR_CPUS^2) make jobs.
-
-		  If you are unsure, select N.
 
 	config PKG_BUILD_JOBS
 		int
 		prompt "Number of package submake jobs (2-512)"
 		range 2 512
 		default 2
-		depends on PKG_BUILD_PARALLEL
+		depends on PKG_BUILD_PARALLEL && !PKG_BUILD_USE_JOBSERVER
 		help
 		  The number of jobs (-jX) to pass to packages submake.