update ar7 config, disable watchdog for now (closes: #2146)

[openwrt.git] / Config.in

diff --git a/Config.in b/Config.in
index fde72b5..2f08b40 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -12,63 +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
-
-config LOCALMIRROR
-       string "Local mirror for source packages" if DEVEL
-
-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"


@@ -93,14 +36,13 @@ 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
                default y if USES_EXT2
                depends !TARGET_ROOTFS_INITRAMFS
                help


@@ -126,5 +68,69 @@ source "target/linux/*/image/Config.in"
 
 endmenu
 
 
 endmenu
 

+
+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
+
+config LOCALMIRROR
+       string "Local mirror for source packages" if DEVEL
+
+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 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 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 SOURCE_FEEDS_REV
+       string
+       prompt "Revision for the source feed svn checkout" if BUILDOPTS
+       default ""
+
+
+source "toolchain/Config.in"
+source "target/imagebuilder/Config.in"
+source "target/sdk/Config.in"
+

 source "tmp/.config-package.in"
 
 source "tmp/.config-package.in"