X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=config%2FConfig-images.in;h=95752f737ad013a296afb5e7b28278a16b73b27d;hb=cc9b9c58855b24a6ffaef4d2973f337052099f10;hp=958bda4227872648c3f2e19c15623d6b932ca8cb;hpb=42d2eb76285f396c914ee6f17474a1e7788cfb36;p=openwrt%2Fstaging%2Fwigyori.git

diff --git a/config/Config-images.in b/config/Config-images.in
index 958bda4227..95752f737a 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -16,6 +16,7 @@ menu "Target Images"
 			prompt "Compression"
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ar71xx
 			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips
+			default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_apm821xx
 			default TARGET_INITRAMFS_COMPRESSION_NONE
 			depends on TARGET_ROOTFS_INITRAMFS
 			help
@@ -72,13 +73,6 @@ menu "Target Images"
 		help
 		  Build an ext4 root filesystem.
 
-		config TARGET_EXT4_MAXINODE
-			int "Maximum number of inodes in root filesystem"
-			depends on TARGET_ROOTFS_EXT4FS
-			default 6000
-			help
-			  Select the maximum number of inodes in the root filesystem.
-
 		config TARGET_EXT4_RESERVED_PCT
 			int "Percentage of reserved blocks in root filesystem"
 			depends on TARGET_ROOTFS_EXT4FS
@@ -126,7 +120,7 @@ menu "Target Images"
 
 	config TARGET_ROOTFS_JFFS2
 		bool "jffs2"
-		default y if USES_JFFS2
+		depends on USES_JFFS2
 		help
 		  Build a JFFS2 root filesystem.
 
@@ -207,9 +201,13 @@ menu "Target Images"
 		int "Serial port baud rate"
 		depends on GRUB_IMAGES
 		default 38400 if TARGET_x86_generic
-		default 38400 if TARGET_x86_geode
 		default 115200
 
+	config GRUB_FLOWCONTROL
+		bool "Use RTE/CTS on serial console"
+		depends on GRUB_SERIAL != ""
+		default n
+
 	config GRUB_BOOTOPTS
 		string "Extra kernel boot options"
 		depends on GRUB_IMAGES
@@ -254,12 +252,12 @@ menu "Target Images"
 	config TARGET_KERNEL_PARTSIZE
 		int "Kernel partition size (in MB)"
 		depends on GRUB_IMAGES
-		default 4
+		default 16
 
 	config TARGET_ROOTFS_PARTSIZE
 		int "Root filesystem partition size (in MB)"
-		depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532
-		default 48
+		depends on GRUB_IMAGES || TARGET_ROOTFS_EXT4FS || TARGET_rb532 || TARGET_mvebu || TARGET_uml
+		default 256
 		help
 		  Select the root filesystem partition size.
 
@@ -271,45 +269,4 @@ menu "Target Images"
 		  it will be mounted by PARTUUID which makes the kernel find the
 		  appropriate disk automatically.
 
-
-	menuconfig TARGET_ROOTFS_INCLUDE_KERNEL
-		bool "Include kernel in root filesystem"
-		depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
-		default n
-		help
-		  Include the kernel image in the rootfs. Typically, the image is placed
-		  below /boot.
-
-		config TARGET_ROOTFS_INCLUDE_UIMAGE
-			bool "include uImage" if TARGET_ROOTFS_INCLUDE_KERNEL
-			default y
-			help
-			  This option might not apply to all targets. Make sure
-			  to check target/linux/<your_target>/image/Makefile to
-			  see if this option will have any effect.
-
-		config TARGET_ROOTFS_INCLUDE_ZIMAGE
-			bool "include zImage" if TARGET_ROOTFS_INCLUDE_KERNEL
-			default y
-			help
-			  This option might not apply to all targets. Make sure
-			  to check target/linux/<your_target>/image/Makefile to
-			  see if this option will have any effect.
-
-		config TARGET_ROOTFS_INCLUDE_FIT
-			bool "include FIT" if TARGET_ROOTFS_INCLUDE_KERNEL
-			default y
-			help
-			  This option might not apply to all targets. Make sure
-			  to check target/linux/<your_target>/image/Makefile to
-			  see if this option will have any effect.
-
-	config TARGET_ROOTFS_INCLUDE_DTB
-		bool "Include DTB in root filesystem"
-		depends on USES_DEVICETREE && (TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS)
-		default n
-		help
-		  Include the device tree blob file(s) in the rootfs. Typically the DTBs
-		  are placed below /boot.
-
 endmenu