X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=Config.in;h=d1d66ff0db2a6611910e4170a3606da73e784794;hb=cb945ac420ef44f4a57ad8486c0e668639eb3c19;hp=31ddbac6d736001ef987b769b02348a185529660;hpb=0cd280b811d0f6c646b65613e0e6c72020a717d0;p=openwrt.git

diff --git a/Config.in b/Config.in
index 31ddbac6d7..d1d66ff0db 100644
--- a/Config.in
+++ b/Config.in
@@ -1,110 +1,101 @@
 #
 
-mainmenu "OpenWRT Configuration"
+mainmenu "OpenWrt Configuration"
 
-config MODULES
+config HAVE_DOT_CONFIG
 	bool
 	default y
 
-config BR2_HAVE_DOT_CONFIG
-	bool
-	default y
-
-choice
-	prompt "Target Architecture"
-	default BR2_mipsel
-	help
-	  Stuff
-
-config BR2_arm
-	bool "arm"
-
-config BR2_armeb
-	bool "armeb"
-
-config BR2_cris
-	bool "cris"
-
-config BR2_i386
-	bool "i386"
-
-config BR2_m68k
-	bool "m68k"
-
-config BR2_mips
-	bool "mips"
-
-config BR2_mipsel
-	bool "mipsel"
-
-config BR2_powerpc
-	bool "powerpc"
-
-config BR2_sh3
-	bool "sh3"
-
-config BR2_sh3eb
-	bool "sh3eb"
-
-config BR2_sh4
-	bool "sh4"
+source "target/Config.in"
 
-config BR2_sh4eb
-	bool "sh4eb"
+config ALL
+	bool "Select all packages by default"
+	default n
 
-config BR2_sparc
-	bool "sparc"
+menuconfig DEVEL
+	bool "Advanced configuration options (for developers)"
+	default n
+	select BUILDOPTS
+	select TOOLCHAINOPTS if !NATIVE_TOOLCHAIN
 
-endchoice
+config BROKEN
+	bool "Show broken platforms / packages" if DEVEL
+	default n
 
-config BR2_ARCH
-	string
-	default "arm"     if BR2_arm
-	default "armeb"   if BR2_armeb
-	default "cris"    if BR2_cris
-	default "i386"    if BR2_i386
-	default "m68k"    if BR2_m68k
-	default "mips"    if BR2_mips
-	default "mipsel"  if BR2_mipsel
-	default "powerpc" if BR2_powerpc
-	default "sh3"     if BR2_sh3
-	default "sh3eb"   if BR2_sh3eb
-	default "sh4"     if BR2_sh4
-	default "sh4eb"   if BR2_sh4eb
-	default "sparc"   if BR2_sparc
+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
 
-menu "Build options"
+config TAR_VERBOSITY
+	bool 
+	prompt "Tar verbose" if BUILDOPTS
+	default n
 
-config BR2_WGET
-	string "Wget command"
-	default "wget --passive-ftp -nd"
+config JLEVEL
+	int
+	prompt "Number of jobs to run simultaneously" if BUILDOPTS
+	default "1"
+	help
+	    Number of jobs to run simultanesouly
 
-config BR2_TAR_VERBOSITY
-	bool "Tar verbose"
+config CCACHE
+	bool
+	prompt "Use ccache" if BUILDOPTS
 	default n
-
-config BR2_STAGING_DIR
-	string "Toolchain and header file location?"
-	default "$(BASE_DIR)/staging_dir_$(ARCH)$(ARCH_FPU_SUFFIX)"
 	help
-	    This is the location where the toolchain will be installed.
-	    Since the toolchain will not work if it is moved from this
-	    location, it is important for people wishing to package up
-	    a uClibc toolchain that this be set to the location in which
-	    the toolchain will be used.
+		Compiler cache; see http://ccache.samba.org/
 
-	    Most people will leave this set to the default value of
-	    "$(BASE_DIR)/staging_dir_$(ARCH)$(ARCH_FPU_SUFFIX)".
+source "toolchain/Config.in"
+source "target/sdk/Config.in"
+
+menu "Target Images"
+	config TARGET_ROOTFS_INITRAMFS
+		bool "ramdisk"
+		default n
+		depends LINUX_2_6
+		help
+		  Embed the rootfs into the kernel (initramfs)
+
+	config TARGET_ROOTFS_JFFS2
+		bool "jffs2"
+		default y
+		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
+		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
+		depends !TARGET_ROOTFS_INITRAMFS
+		help
+		  Build a compressed tar archive of the the root filesystem
+		  
+	config TARGET_ROOTFS_EXT2FS
+		bool "ext2"
+		default y if LINUX_2_6_UML
+		depends !TARGET_ROOTFS_INITRAMFS
+		help
+		  Ext2 file system with some free space for uml images
 
-config BR2_JLEVEL
-	int "Number of jobs to run simultaneously"
-	default "1"
-	help
-	    Number of jobs to run simultanesouly
 
 endmenu
 
-source "toolchain/Config.in"
-source "package/Config.in"
-source "target/Config.in"
+source "target/linux/Config.in"
+source ".config.in"
+