don't override netfilter configuration on storm

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index ce226e0..95b9a4b 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -41,6 +41,13 @@ menu "Target Images"
                help
                  Build a compressed tar archive of the the root filesystem
                  
+       config TARGET_ROOTFS_CPIOGZ
+               bool "cpiogz"
+               default y if USES_CPIOGZ
+               depends !TARGET_ROOTFS_INITRAMFS
+               help
+                 Build a compressed cpio archive of the the root filesystem
+                 
        config TARGET_ROOTFS_EXT2FS
                bool "ext2"
                default y if USES_EXT2
@@ -48,21 +55,28 @@ menu "Target Images"
                help
                  Ext2 file system with some free space for uml images
 
+       config TARGET_ROOTFS_ISO 
+               bool "iso" 
+               default n 
+               depends TARGET_ROOTFS_INITRAMFS && TARGET_x86 
+               help 
+                 Create some bootable ISO image 
+
 comment "Image Options"
 
 source "target/linux/*/image/Config.in"
 
     config TARGET_ROOTFS_FSPART
         int "Filesystem part size (in MB)"
-        depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || LINUX_2_6_RB532
-        default 16
+        depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || TARGET_rb532 || TARGET_olpc
+        default 48
         help
             Allows you to change the filesystem partition size
 
     config TARGET_ROOTFS_MAXINODE
         int "Maximum number of inodes in filesystem"
         depends TARGET_ROOTFS_EXT2FS
-        default 1500
+        default 6000
         help
             Allows you to change the maximum number of inodes in the filesystem
 
@@ -80,14 +94,39 @@ menuconfig DEVEL
        select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
 
 config BROKEN
-       bool "Show broken platforms / packages" if DEVEL
+       bool
+       prompt "Show broken platforms / packages" if DEVEL
        default n
 
+config DOWNLOAD_FOLDER
+       string
+       prompt "Download folder" if DEVEL
+       default ""
+
 config LOCALMIRROR
-       string "Local mirror for source packages" if DEVEL
+       string
+       prompt "Local mirror for source packages" if DEVEL
 
 menuconfig BUILDOPTS
-       bool "Build Options" if DEVEL
+       bool
+       prompt "Build Options" if DEVEL
+
+config DEBUG
+       bool
+       prompt "Enable debugging" if BUILDOPTS
+       select NO_STRIP
+       default n
+       help
+               Disables stripping and adds -g3 to the CFLAGS
+
+config NO_STRIP
+       bool "Do not strip generated binaries (enable for native compiling)" if BUILDOPTS
+       default n
+
+config CLEAN_IPKG
+       bool
+       prompt "Clean all ipkg files before building the rootfs" if BUILDOPTS
+       default n
 
 config AUTOREBUILD
        bool
@@ -115,22 +154,16 @@ config CCACHE
        help
                Compiler cache; see http://ccache.samba.org/
 
-config SOURCE_FEEDS
+config EXTERNAL_KERNEL_TREE
        string
-       prompt "Enter here external source feeds you want to include" if BUILDOPTS
-       default "https://svn.openwrt.org/openwrt/packages/"
-       help
-               Separate sources with spaces : " "
-
-config SOURCE_FEEDS_REV
-       string
-       prompt "Revision for the source feed svn checkout" if BUILDOPTS
+       prompt "Use external kernel tree" if BUILDOPTS
        default ""
 
-
 source "toolchain/Config.in"
+
 source "target/imagebuilder/Config.in"
 source "target/sdk/Config.in"
 
 source "tmp/.config-package.in"
 
+