X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fyousong.git;a=blobdiff_plain;f=config%2FConfig-images.in;h=f4bb2ce2cbbb3f4d059e954a031227e2e2b681cc;hp=c9a75e4a07b6d179f1811e70df40d45d90ee7f63;hb=5eecccd75edc9a5adbdf966a6a87f46695aa72a9;hpb=7aaa9bc91c9e905f3b943e2b8a1cb3ce140fe9a5

diff --git a/config/Config-images.in b/config/Config-images.in
index c9a75e4a07..f4bb2ce2cb 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -66,11 +66,56 @@ menu "Target Images"
 
 	comment "Root filesystem images"
 
-	config TARGET_ROOTFS_EXT4FS
+	menuconfig TARGET_ROOTFS_EXT4FS
 		bool "ext4"
 		default y if USES_EXT4
 		help
-		  Ext4 file system with some free space for uml images
+		  Build a ext4 root filesystem
+
+		config TARGET_EXT4_MAXINODE
+			int "Maximum number of inodes in root filesystem"
+			depends on TARGET_ROOTFS_EXT4FS
+			default 6000
+			help
+			  Allows you to change 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
+			default 0
+			help
+			  Allows you to change the percentage of reserved blocks in the root filesystem
+
+		choice
+			prompt "Root filesystem block size"
+			default TARGET_EXT4_BLOCKSIZE_4K
+			depends on TARGET_ROOTFS_EXT4FS
+			help
+			  Allows you to change the block size of the root filesystem
+
+			config TARGET_EXT4_BLOCKSIZE_4K
+				bool "4k"
+
+			config TARGET_EXT4_BLOCKSIZE_2K
+				bool "2k"
+
+			config TARGET_EXT4_BLOCKSIZE_1K
+				bool "1k"
+		endchoice
+
+		config TARGET_EXT4_BLOCKSIZE
+			int
+			default 4096 if TARGET_EXT4_BLOCKSIZE_4K
+			default 2048 if TARGET_EXT4_BLOCKSIZE_2K
+			default 1024 if TARGET_EXT4_BLOCKSIZE_1K
+			depends on TARGET_ROOTFS_EXT4FS
+
+		config TARGET_EXT4_JOURNAL
+			bool "Create a journaling filesystem"
+			depends on TARGET_ROOTFS_EXT4FS
+			default n
+			help
+			  Create an ext4 filesystem with a journal
 
 	config TARGET_ROOTFS_ISO
 		bool "iso"
@@ -92,12 +137,17 @@ menu "Target Images"
 		help
 		  Build a jffs2 root filesystem for NAND flash
 
-	config TARGET_ROOTFS_SQUASHFS
+	menuconfig TARGET_ROOTFS_SQUASHFS
 		bool "squashfs"
 		default y if USES_SQUASHFS
 		help
 		  Build a squashfs-lzma root filesystem
 
+		config TARGET_SQUASHFS_BLOCK_SIZE
+			int "Block size (in KiB)"
+			depends on TARGET_ROOTFS_SQUASHFS
+			default 256
+
 	menuconfig TARGET_ROOTFS_UBIFS
 		bool "ubifs"
 		default y if USES_UBIFS
@@ -216,26 +266,12 @@ menu "Target Images"
 	config TARGET_ROOTFS_PARTNAME
 		string "Root partition on target device"
 		depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
-		default "/dev/vda2" if TARGET_x86_kvm_guest
 		default "/dev/xvda2" if TARGET_x86_xen_domu
-		default "/dev/sda2" if ! (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
+		default "/dev/sda2" if ! TARGET_x86_xen_domu
 		help
 		  The root partition on the final device.  If you don't know,
 		  you probably want the default (/dev/sda2).
 
-	config TARGET_ROOTFS_MAXINODE
-		int "Maximum number of inodes in root filesystem"
-		depends on TARGET_ROOTFS_EXT4FS
-		default 6000
-		help
-		  Allows you to change the maximum number of inodes in the root filesystem
-
-	config TARGET_ROOTFS_RESERVED_PCT
-		int "Percentage of reserved blocks in root filesystem"
-		depends on TARGET_ROOTFS_EXT4FS
-		default 0
-		help
-		  Allows you to change the percentage of reserved blocks in the root filesystem
 
 	menuconfig TARGET_ROOTFS_INCLUDE_KERNEL
 		bool "Include kernel in root filesystem"