fix wr850g detection (#1936)

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index 0b6fa95..9142ad3 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -12,60 +12,6 @@ config HAVE_DOT_CONFIG
 
 source "target/Config.in"
 
 
 source "target/Config.in"
 

-config ALL
-       bool "Select all packages by default"
-       default n
-
-menuconfig DEVEL
-       bool "Advanced configuration options (for developers)"
-       default n
-       select BUILDOPTS
-       select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
-
-config BROKEN
-       bool "Show broken platforms / packages" if DEVEL
-       default n
-
-menuconfig BUILDOPTS
-       bool "Build Options" if DEVEL
-
-config AUTOREBUILD
-       bool
-       prompt "Automatic rebuild of packages" if BUILDOPTS
-       default y
-       help
-               Automatically rebuild packages when their files change
-
-config TAR_VERBOSITY
-       bool 
-       prompt "Tar verbose" if BUILDOPTS
-       default n
-
-config JLEVEL
-       int
-       prompt "Number of jobs to run simultaneously" if BUILDOPTS
-       default "1"
-       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 "target/imagebuilder/Config.in"
-source "target/sdk/Config.in"
-

 menu "Target Images"
        config TARGET_ROOTFS_INITRAMFS
                bool "ramdisk"
 menu "Target Images"
        config TARGET_ROOTFS_INITRAMFS
                bool "ramdisk"


@@ -90,38 +36,125 @@ menu "Target Images"
 
        config TARGET_ROOTFS_TGZ
                bool "tgz"
 
        config TARGET_ROOTFS_TGZ
                bool "tgz"

-               default y if !USES_SQUASHFS && !USES_JFFS2
+               default y if USES_TGZ

                depends !TARGET_ROOTFS_INITRAMFS
                help
                  Build a compressed tar archive of the the root filesystem
                  
        config TARGET_ROOTFS_EXT2FS
                bool "ext2"
                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
 
                default y if USES_EXT2
                depends !TARGET_ROOTFS_INITRAMFS
                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)"
 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
+        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"
         default 16
         help
             Allows you to change the filesystem partition size
 
     config TARGET_ROOTFS_MAXINODE
         int "Maximum number of inodes in filesystem"

-        depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS
+        depends TARGET_ROOTFS_EXT2FS

         default 1500
         help
             Allows you to change the maximum number of inodes in the filesystem
 
 endmenu
 
         default 1500
         help
             Allows you to change the maximum number of inodes in the filesystem
 
 endmenu
 

-source "tmp/.config.in"
+
+config ALL
+       bool "Select all packages by default"
+       default n
+
+menuconfig DEVEL
+       bool "Advanced configuration options (for developers)"
+       default n
+       select BUILDOPTS
+       select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
+
+config BROKEN
+       bool
+       prompt "Show broken platforms / packages" if DEVEL
+       default n
+
+config LOCALMIRROR
+       string
+       prompt "Local mirror for source packages" if DEVEL
+
+menuconfig BUILDOPTS
+       bool
+       prompt "Build Options" if DEVEL
+
+config CLEAN_IPKG
+       bool
+       prompt "Clean all ipkg files before building the rootfs" if BUILDOPTS
+       default n
+
+config AUTOREBUILD
+       bool
+       prompt "Automatic rebuild of packages" if BUILDOPTS
+       default y
+       help
+               Automatically rebuild packages when their files change
+
+config BUILD_SUFFIX
+       string
+       prompt "Build suffix to append to the BUILD_DIR variable" if BUILDOPTS
+       default ""
+       help
+               Build suffix to append to the BUILD_DIR variable, i.e: build_dir_suffix
+
+config TAR_VERBOSITY
+       bool 
+       prompt "Tar verbose" if BUILDOPTS
+       default n
+
+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 : " "
+
+config SOURCE_FEEDS_REV
+       string
+       prompt "Revision for the source feed svn checkout" if BUILDOPTS
+       default ""
+
+
+source "toolchain/Config.in"
+menuconfig BUILDSYSTEM_SETTINGS
+    bool "Buildsystem settings" 
+
+config DOWNLOAD_FOLDER
+       string
+       prompt "Download folder"
+       default ""
+       depends BUILDSYSTEM_SETTINGS 
+source "target/imagebuilder/Config.in"
+source "target/sdk/Config.in"
+
+source "tmp/.config-package.in"
+