move x86 back to .32 for now

[openwrt/openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index ab8fbf8e4d51ea103fb8a63e43e359cd81a4e2bf..5763be02b1efccbe64a21cbbbe6f7e970a1d83f2 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.
@@ -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)
 
@@ -63,12 +62,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"
@@ -104,14 +103,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
@@ -126,6 +125,10 @@ menu "Global build settings"
 
        comment "General build options"
 
+       config DISPLAY_SUPPORT
+               bool "Show packages that require graphics support (local or remote)"
+               default n
+
        config BUILD_PATENTED
                default y
                bool "Compile with support for patented functionality"
@@ -169,7 +172,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
@@ -334,7 +336,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