X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=Config.in;h=a7ef477b200091b13079253b52a352f784312e9d;hb=34386642d12fb4e9c39212e7ad44222f2fb38aca;hp=0ef2f1413d79b365df141646bd6742a7d550421a;hpb=d97a18478000cde6d2130dbbfa8542da73ab1b28;p=openwrt.git

diff --git a/Config.in b/Config.in
index 0ef2f1413d..a7ef477b20 100644
--- a/Config.in
+++ b/Config.in
@@ -107,13 +107,47 @@ menu "Target Images"
 		help
 		  Build a squashfs-lzma root filesystem
 
-	config TARGET_ROOTFS_UBIFS
+	menuconfig TARGET_ROOTFS_UBIFS
 		bool "ubifs"
 		default y if USES_UBIFS
 		depends on USES_UBIFS
 		help
 		  Build a ubifs root filesystem
 
+		choice
+			prompt "compression"
+			default TARGET_UBIFS_COMPRESSION_NONE
+			depends on TARGET_ROOTFS_UBIFS
+			help
+			  Select compression type
+
+			config TARGET_UBIFS_COMPRESSION_NONE
+				bool "none"
+
+			config TARGET_UBIFS_COMPRESSION_LZO
+				bool "lzo"
+
+			config TARGET_UBIFS_COMPRESSION_ZLIB
+				bool "zlib"
+		endchoice
+
+		config TARGET_UBIFS_FREE_SPACE_FIXUP
+			bool "free space fixup" if TARGET_ROOTFS_UBIFS
+			default y
+			help
+			  The file-system free space has to be fixed up on first mount
+
+		config TARGET_UBIFS_JOURNAL_SIZE
+			string
+			prompt "journal size" if TARGET_ROOTFS_UBIFS
+			default "512KiB"
+
+		config TARGET_UBIFS_SQUASH_UIDS
+			bool "squash uids" if TARGET_ROOTFS_UBIFS
+			default n
+			help
+			  Squash owners making all files owned by root
+
 	comment "Image Options"
 
 	source "target/linux/*/image/Config.in"
@@ -140,18 +174,20 @@ menu "Target Images"
 		  Allows you to change the percentage of reserved blocks in the root filesystem
 
 	config TARGET_ROOTFS_INCLUDE_KERNEL
-		bool "include kernel in rootfs"
+		bool "Include kernel in root filesystem"
 		depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
 		default n if USES_UBIFS
 		help
-		  Include the kernel image in the rootfs
+		  Include the kernel image in the rootfs. Typically the image is placed
+		  below /boot.
 
 	config TARGET_ROOTFS_INCLUDE_DTB
-		bool "include dtb in rootfs"
+		bool "Include DTB in root filesystem"
 		depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
 		default n if USES_UBIFS
 		help
-		  Include the device tree blob file in the rootfs
+		  Include the device tree blob file(s) in the rootfs. Typically the DTBs
+		  are placed below /boot.
 
 endmenu
 
@@ -877,6 +913,8 @@ menuconfig TARGET_OPTIONS
 	config USE_MIPS16
 		bool "Build packages with MIPS16 instructions" if TARGET_OPTIONS
 		depends on HAS_MIPS16
+		depends on !GCC_VERSION_4_6
+		default y
 		help
 		  If your target CPU does support the MIPS16 instruction set
 		  and you want to use it for packages, enable this option.