[adm5120] sync kernel config

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index c8b739c..afcdd00 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_TGZ
+               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
@@ -61,7 +68,7 @@ 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
+        depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS || TARGET_rb532 || TARGET_olpc
         default 16
         help
             Allows you to change the filesystem partition size
@@ -130,24 +137,11 @@ config CCACHE
        help
                Compiler cache; see http://ccache.samba.org/
 
-config SOURCE_FEEDS
-       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
-       default ""
-
 config EXTERNAL_KERNEL_TREE
        string
        prompt "Use external kernel tree" if DEVEL
        default ""
 
-
 source "toolchain/Config.in"
 menuconfig BUILDSYSTEM_SETTINGS
     bool "Buildsystem settings"