ar71xx: fix 'section type conflict' build error

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index ab4fbe8..c798510 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2007 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -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"
@@ -122,8 +130,23 @@ config CLEAN_IPKG
        help
                This removes all ipkg data from the target directory before building the root fs
 
+config LARGEFILE
+       bool
+       prompt "Enable large file (files > 2 GB) support"
+       default y
+       help
+         Enable large file (files > 2 GB) support.
+
+config SHADOW_PASSWORDS
+       bool
+       prompt "Enable shadow password support"
+       default y
+       help
+         Enable shadow password support.
+
 choice
        prompt "Binary stripping method"
+       default USE_STRIP   if EXTERNAL_TOOLCHAIN
        default USE_STRIP   if USE_GLIBC || USE_EGLIBC
        default USE_SSTRIP
        help
@@ -136,7 +159,6 @@ choice
 
        config USE_STRIP
                bool "strip"
-               depends !DEBUG
                help
                  This will install binaries stripped using strip from binutils
 
@@ -151,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
@@ -174,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"
@@ -197,6 +228,7 @@ config KERNEL_KALLSYMS
        default n
        help
                This will give you more information in stack traces from kernel oopses
+
 config KERNEL_PROFILING
        bool "Compile the kernel with profiling enabled"
        default n
@@ -204,12 +236,20 @@ config KERNEL_PROFILING
                Enable the extended profiling support mechanisms used by profilers such
                as OProfile.
 
+config KERNEL_DEBUG_FS
+       bool "Compile the kernel with Debug Filesystem enabled"
+       depends LINUX_2_6
+       default y
+       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
+               write to these files.
+
 endmenu
 
 menuconfig DEVEL
        bool "Advanced configuration options (for developers)"
        default n
-       select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
 
 config BROKEN
        bool
@@ -278,10 +318,36 @@ config KERNEL_GIT_LOCAL_REPOSITORY
                In this instance, the --refererence option of git clone will
                be used thus creating a quick local clone of your repo.
 
+
+menuconfig TARGET_OPTIONS
+       bool "Target Options"  if DEVEL
+
+config TARGET_OPTIMIZATION
+       string
+       prompt "Target Optimizations" if TARGET_OPTIONS
+       default DEFAULT_TARGET_OPTIMIZATION
+       help
+         Optimizations to use when building for the target host.
+
+config SOFT_FLOAT
+       bool
+       prompt "Use software floating point by default" if TARGET_OPTIONS
+       default y
+       depends on (arm || armeb || powerpc || mipsel || mips) && !HAS_FPU
+       help
+         If your target CPU does not have a Floating Point Unit (FPU) or a
+         kernel FPU emulator, but you still wish to support floating point
+         functions, then everything will need to be compiled with soft floating
+         point support (-msoft-float).
+
+         Most people will answer N.
+
+
 source "toolchain/Config.in"
 
 source "target/imagebuilder/Config.in"
 source "target/sdk/Config.in"
+source "target/toolchain/Config.in"
 
 source "tmp/.config-package.in"