X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=Config.in;h=18555a432571fd1f2110472f20063cba2a347ac8;hb=29e8bb31302ea0bdee2d4ac80edd8a9c96d1a96a;hp=caa79447993336a95d72b372fcf7ecc2be769ecd;hpb=2f9334da3b7749dd8ab69d1a6289e61bdb26e976;p=openwrt.git

diff --git a/Config.in b/Config.in
index caa7944799..18555a4325 100644
--- 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
@@ -51,6 +51,13 @@ config CCACHE
 	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/sdk/Config.in"
 
@@ -64,38 +71,43 @@ 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 y if LINUX_2_6_UML
+		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
+		default 16
 
 endmenu
 
-source "target/linux/Config.in"
-source ".config.in"
+source "tmp/.config.in"