tools/mtd-utils: add two upstream patches

[openwrt/staging/yousong.git] / Config.in

diff --git a/Config.in b/Config.in
index 85d3adf9fd8720436aae65d0fcf3c46bfcef9a3e..77eea2d60a4efbf564f401daa7ff8f5ed87f1c41 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -17,7 +17,6 @@ menu "Target Images"
        menuconfig TARGET_ROOTFS_INITRAMFS
                bool "ramdisk"
                default y if USES_INITRAMFS
-               depends LINUX_2_6
                help
                  Embed the rootfs into the kernel (initramfs)
 
@@ -169,7 +168,6 @@ menu "Global build settings"
        config KERNEL_DEBUG_FS
                bool "Compile the kernel with Debug FileSystem enabled"
                default y
-               depends LINUX_2_6
                help
                  debugfs is a virtual file system that kernel developers use to put
                  debugging files into. Enable this option to be able to read and
@@ -199,6 +197,25 @@ menu "Global build settings"
                help
                  This will compile your kernel and modules with debug information.
 
+       config KERNEL_DEBUG_LL
+               bool
+               default n
+               depends on arm
+               help
+                 ARM low level debugging
+
+       config KERNEL_EARLY_PRINTK
+               bool "Compile the kernel with early printk"
+               default n
+               depends on arm
+               select KERNEL_DEBUG_KERNEL
+               select KERNEL_DEBUG_LL if arm
+               help
+                 Compile the kernel with early printk support.
+                 This is only useful for debugging purposes to send messages
+                 over the serial console in early boot.
+                 Enable this to debug early boot problems.
+
        comment "Package build options"
 
        config DEBUG
@@ -247,6 +264,34 @@ menu "Global build settings"
                help
                  The number of jobs (-jX) to pass to packages submake.
 
+       config PKG_DEFAULT_PARALLEL
+               bool
+               prompt "Parallelize the default package build rule (May break build)"
+               depends on PKG_BUILD_PARALLEL
+               default n
+               help
+                 Always set the default package build rules to parallel build.
+
+                 WARNING: This may break build or kill your cat, as it builds
+                 packages with multiple jobs that are probably not tested in
+                 a parallel build environment.
+
+                 Only say Y, if you don't mind fixing broken packages.
+                 Before reporting build bugs, set this to N and re-run the build.
+
+       config TOOLCHAIN_PARALLEL
+               bool
+               prompt "Parallelize the toolchain build (May break build)"
+               depends on PKG_BUILD_PARALLEL
+               default n
+               help
+                 Build the toolchain with parallel make jobs.
+                 This speeds up the toolchain build on SMP machines, but may
+                 break the build for certain toolchain versions.
+
+                 If you say Y, toolchain build might break.
+                 Before reporting build bugs, set this to N and re-run the build.
+
        comment "Stripping options"
 
        choice
@@ -287,7 +332,6 @@ menu "Global build settings"
                  Specifies arguments passed to the strip command when stripping binaries
 
        config STRIP_KERNEL_EXPORTS
-               depends LINUX_2_6
                bool "Strip unnecessary exports from the kernel image"
                help
                  Reduces kernel size by stripping unused kernel exports from the kernel image