ar71xx: fix 'section type conflict' build error

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index ae1ba9f..c798510 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -25,8 +25,6 @@ menu "Target Images"
                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
@@ -43,6 +41,9 @@ menu "Target Images"
 
                config TARGET_INITRAMFS_COMPRESSION_LZMA
                        bool "LZMA"
+
+               config TARGET_INITRAMFS_COMPRESSION_LZO
+                       bool "LZO"
        endchoice
 
        config TARGET_ROOTFS_JFFS2
@@ -87,6 +88,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"
@@ -157,6 +165,7 @@ choice
 
        config USE_SSTRIP
                bool "sstrip"
+               depends !DEBUG
                depends !USE_GLIBC
                depends !USE_EGLIBC
                help
@@ -164,6 +173,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
@@ -187,7 +205,7 @@ config DEBUG
        prompt "Compile packages with debugging info"
        default n
        help
-               Disables stripping and adds -g3 to the CFLAGS
+               Adds -g3 to the CFLAGS
 
 config DEBUG_DIR
        bool "Install debugging binaries into a staging directory"
@@ -329,6 +347,7 @@ source "toolchain/Config.in"
 
 source "target/imagebuilder/Config.in"
 source "target/sdk/Config.in"
+source "target/toolchain/Config.in"
 
 source "tmp/.config-package.in"