add zlib fix from #855

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index 752e1d9..bdd5547 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -16,7 +16,7 @@ menuconfig DEVEL
        bool "Advanced configuration options (for developers)"
        default n
        select BUILDOPTS
-       select TOOLCHAINOPTS
+       select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
 
 config BROKEN
        bool "Show broken platforms / packages" if DEVEL
@@ -44,6 +44,13 @@ config JLEVEL
        help
            Number of jobs to run simultanesouly
 
+config CCACHE
+       bool
+       prompt "Use ccache" if BUILDOPTS
+       default n
+       help
+               Compiler cache; see http://ccache.samba.org/
+
 source "toolchain/Config.in"
 source "target/sdk/Config.in"
 
@@ -57,35 +64,36 @@ menu "Target Images"
 
        config TARGET_ROOTFS_JFFS2
                bool "jffs2"
-               default y
+               default y if USES_JFFS2
                depends !TARGET_ROOTFS_INITRAMFS
                help
                  Build a jffs2 root filesystem
 
        config TARGET_ROOTFS_SQUASHFS
                bool "squashfs"
-               default y
-               depends !LINUX_2_6_ARUBA
-               depends !LINUX_2_6_XSCALE
+               default y if USES_SQUASHFS
                depends !TARGET_ROOTFS_INITRAMFS
-               depends !LINUX_2_6_AU1000
                help
                  Build a squashfs-lzma root filesystem
 
        config TARGET_ROOTFS_TGZ
                bool "tgz"
-               default y if !LINUX_2_4_BRCM && !LINUX_2_6_BRCM && !LINUX_2_6_ARUBA && !LINUX_2_4_AR531X
+               default y if !USES_SQUASHFS && !USES_JFFS2
                depends !TARGET_ROOTFS_INITRAMFS
                help
                  Build a compressed tar archive of the the root filesystem
                  
        config TARGET_ROOTFS_EXT2FS
                bool "ext2"
-               default n
+               default y if !USES_SQUASHFS && !USES_JFFS2
+               default y if USES_EXT2
                depends !TARGET_ROOTFS_INITRAMFS
                help
                  Ext2 file system with some free space for uml images
 
+comment "Image Options"
+
+source "target/image/*/Config.in"
 
 endmenu