X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=config%2FConfig-images.in;h=39e51e4c6eeb5be7057dee70edb57410fb38b849;hb=a38327ac0f1ba85a1c35c39f1c91de0287ec8b2e;hp=636a868d593c3446fbd4804f8e51e5373e3486fa;hpb=93972bcb49064aaa1295ed0d493cd2ab0585f31c;p=openwrt.git

diff --git a/config/Config-images.in b/config/Config-images.in
index 636a868d59..39e51e4c6e 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -72,14 +72,14 @@ menu "Target Images"
 		help
 		  Build a ext4 root filesystem
 
-		config TARGET_ROOTFS_MAXINODE
+		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_ROOTFS_RESERVED_PCT
+		config TARGET_EXT4_RESERVED_PCT
 			int "Percentage of reserved blocks in root filesystem"
 			depends on TARGET_ROOTFS_EXT4FS
 			default 0
@@ -87,9 +87,9 @@ menu "Target Images"
 			  Allows you to change the percentage of reserved blocks in the root filesystem
 
 		choice
-			prompt "Root filesystem block size""
+			prompt "Root filesystem block size"
 			default TARGET_EXT4_BLOCKSIZE_4K
-			depends TARGET_ROOTFS_EXT4FS
+			depends on TARGET_ROOTFS_EXT4FS
 			help
 			  Allows you to change the block size of the root filesystem
 
@@ -108,7 +108,7 @@ menu "Target Images"
 			default 4096 if TARGET_EXT4_BLOCKSIZE_4K
 			default 2048 if TARGET_EXT4_BLOCKSIZE_2K
 			default 1024 if TARGET_EXT4_BLOCKSIZE_1K
-			depends TARGET_ROOTFS_EXT4FS
+			depends on TARGET_ROOTFS_EXT4FS
 
 		config TARGET_EXT4_JOURNAL
 			bool "Create a journaling filesystem"
@@ -137,12 +137,18 @@ 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 64 if LOW_MEMORY_FOOTPRINT
+			default 256
+
 	menuconfig TARGET_ROOTFS_UBIFS
 		bool "ubifs"
 		default y if USES_UBIFS
@@ -152,7 +158,7 @@ menu "Target Images"
 
 		choice
 			prompt "compression"
-			default TARGET_UBIFS_COMPRESSION_NONE
+			default TARGET_UBIFS_COMPRESSION_ZLIB
 			depends on TARGET_ROOTFS_UBIFS
 			help
 			  Select compression type
@@ -223,14 +229,14 @@ menu "Target Images"
 		bool "Build VirtualBox image files (VDI)"
 		depends on TARGET_x86 || TARGET_x86_64
 		select GRUB_IMAGES
-		select TARGET_ROOTFS_EXT4FS
+		select TARGET_IMAGES_PAD
 		select PACKAGE_kmod-e1000
 
 	config VMDK_IMAGES
 		bool "Build VMware image files (VMDK)"
 		depends on TARGET_x86 || TARGET_x86_64
 		select GRUB_IMAGES
-		select TARGET_ROOTFS_EXT4FS
+		select TARGET_IMAGES_PAD
 		select PACKAGE_kmod-e1000
 
 	config TARGET_IMAGES_PAD