fixup the hunks in patch

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index 180d7ac..30d7eca 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -23,10 +23,7 @@ menu "Target Images"
        choice
                prompt "ramdisk compression"
                depends TARGET_ROOTFS_INITRAMFS
-               depends !LINUX_2_6_21
                depends !LINUX_2_6_25
-               depends !LINUX_2_6_27
-               depends !LINUX_2_6_28
                default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
                default TARGET_INITRAMFS_COMPRESSION_NONE
                help
@@ -90,6 +87,13 @@ menu "Target Images"
                help
                  Create some bootable ISO image
 
+       config TARGET_ROOTFS_UBIFS
+               bool "ubifs"
+               default y if USES_UBIFS
+               depends !TARGET_ROOTFS_INITRAMFS && USES_UBIFS
+               help
+                 Build a ubifs root filesystem
+
 comment "Image Options"
 
 source "target/linux/*/image/Config.in"
@@ -154,7 +158,6 @@ choice
 
        config USE_STRIP
                bool "strip"
-               depends !DEBUG
                help
                  This will install binaries stripped using strip from binutils
 
@@ -169,6 +172,15 @@ choice
 
 endchoice
 
+config STRIP_ARGS
+       string
+       prompt "Strip arguments"
+       depends USE_STRIP
+       default "--strip-unneeded --remove-section=.comment --remove-section=.note" if DEBUG
+       default "--strip-all"
+       help
+         Specifies arguments passed to the strip command when stripping binaries
+
 config USE_MKLIBS
        bool "Strip unnecessary functions from libraries"
        help