revert bogus target.mk change from [6465]

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index 573cda5..cdc7b6e 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -1,3 +1,7 @@
+# Copyright (C) 2006-2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.

 #
 
 mainmenu "OpenWrt Configuration"
 #
 
 mainmenu "OpenWrt Configuration"


@@ -16,7 +20,11 @@ menuconfig DEVEL
        bool "Advanced configuration options (for developers)"
        default n
        select BUILDOPTS
        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
+       default n

 
 menuconfig BUILDOPTS
        bool "Build Options" if DEVEL
 
 menuconfig BUILDOPTS
        bool "Build Options" if DEVEL


@@ -40,7 +48,22 @@ config JLEVEL
        help
            Number of jobs to run simultanesouly
 
        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/
+
+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 : " "
+

 source "toolchain/Config.in"
 source "toolchain/Config.in"

+source "target/imagebuilder/Config.in"

 source "target/sdk/Config.in"
 
 menu "Target Images"
 source "target/sdk/Config.in"
 
 menu "Target Images"


@@ -53,29 +76,52 @@ menu "Target Images"
 
        config TARGET_ROOTFS_JFFS2
                bool "jffs2"
 
        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"
                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
                help
                  Build a squashfs-lzma root filesystem
 
        config TARGET_ROOTFS_TGZ
                bool "tgz"
                depends !TARGET_ROOTFS_INITRAMFS
                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
                depends !TARGET_ROOTFS_INITRAMFS
                help
                  Build a compressed tar archive of the the root filesystem

+                 
+       config TARGET_ROOTFS_EXT2FS
+               bool "ext2"
+               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/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
+        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
+        help
+            Allows you to change the maximum number of inodes in the filesystem

 
 endmenu
 
 
 endmenu
 

-source "target/linux/Config.in"
-source ".config.in"
+source "tmp/.config.in"