ramips: simplify uci-defaults/network script

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index 458a3b3..736a972 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2009 OpenWrt.org
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -26,7 +26,6 @@ menu "Target Images"
                        default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
                        default TARGET_INITRAMFS_COMPRESSION_NONE
                        depends TARGET_ROOTFS_INITRAMFS
-                       depends !LINUX_2_6_25
                        help
                          Select ramdisk compression.
 
@@ -44,6 +43,10 @@ menu "Target Images"
 
                        config TARGET_INITRAMFS_COMPRESSION_LZO
                                bool "lzo"
+
+                       config TARGET_INITRAMFS_COMPRESSION_XZ
+                               bool "xz"
+                               depends LINUX_2_6_38
                endchoice
 
        comment "Root filesystem archives"
@@ -62,12 +65,12 @@ menu "Target Images"
 
        comment "Root filesystem images"
 
-       config TARGET_ROOTFS_EXT2FS
-               bool "ext2"
-               default y if USES_EXT2
+       config TARGET_ROOTFS_EXT4FS
+               bool "ext4"
+               default y if USES_EXT4
                depends !TARGET_ROOTFS_INITRAMFS
                help
-                 Ext2 file system with some free space for uml images
+                 Ext4 file system with some free space for uml images
 
        config TARGET_ROOTFS_ISO
                bool "iso"
@@ -103,14 +106,14 @@ menu "Target Images"
 
        config TARGET_ROOTFS_PARTSIZE
                int "Root filesystem partition size (in MB)"
-               depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || TARGET_rb532
+               depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532
                default 48
                help
                    Allows you to change the root filesystem partition size
 
        config TARGET_ROOTFS_MAXINODE
                int "Maximum number of inodes in root filesystem"
-               depends TARGET_ROOTFS_EXT2FS
+               depends TARGET_ROOTFS_EXT4FS
                default 6000
                help
                    Allows you to change the maximum number of inodes in the root filesystem
@@ -137,12 +140,12 @@ menu "Global build settings"
                  In case software provides optional support for patented functionality,
                  this optional support will get disabled for this package.
 
-       config LARGEFILE
-               bool
-               prompt "Enable large file (files > 2 GB) support"
-               default y
+       config BUILD_NLS
+               default n
+               bool "Compile with full language support"
                help
-                 Enable large file (files > 2 GB) support.
+                 When this option is enabled, packages are built with the full versions of iconv and GNU gettext
+                 instead of the default OpenWrt stubs.
 
        config SHADOW_PASSWORDS
                bool
@@ -220,6 +223,27 @@ menu "Global build settings"
                  over the serial console in early boot.
                  Enable this to debug early boot problems.
 
+       config KERNEL_AIO
+               bool "Compile the kernel with asynchronous IO support"
+               default n
+
+       config KERNEL_MAGIC_SYSRQ
+               bool "Compile the kernel with SysRq support"
+               default n
+
+       config KERNEL_ELF_CORE
+               bool "Enable process core dump support"
+               default y
+
+       config KERNEL_PROVE_LOCKING
+               bool "Enable kernel lock checking"
+               select KERNEL_DEBUG_KERNEL
+               default n
+
+       config KERNEL_PRINTK_TIME
+               bool "Enable printk timestamps"
+               default y
+
        comment "Package build options"
 
        config DEBUG
@@ -414,6 +438,19 @@ menuconfig DEVEL
                  In this instance, the --refererence option of git clone will
                  be used thus creating a quick local clone of your repo.
 
+       config BUILD_LOG
+               bool "Enable log files during build process" if DEVEL
+               help
+                 If enabled log files will be written to the ./log directory
+
+       config SRC_TREE_OVERRIDE
+               bool "Enable package source tree override" if DEVEL
+               help
+                 If enabled, you can force a package to use a git tree as source
+                 code instead of the normal tarball. Create a symlink 'git-src'
+                 in the package directory, pointing to the .git tree that you want
+                 to pull the source code from
+
 menuconfig TARGET_OPTIONS
        bool "Target Options"  if DEVEL