X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=Config.in;h=38d11eb28170c29bf50d9a2eb3224bba10c80fc6;hb=892f5b1eaa2200f14467fb48da656e61dc9075e2;hp=acfb437bd479bcc47dea44c772439d8665c788d0;hpb=f0be70afc3a87b384a4710a4db888647edbc02b3;p=openwrt.git

diff --git a/Config.in b/Config.in
index acfb437bd4..38d11eb281 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"
@@ -139,7 +173,7 @@ menu "Target Images"
 		help
 		  Allows you to change the percentage of reserved blocks in the root filesystem
 
-	config TARGET_ROOTFS_INCLUDE_KERNEL
+	menuconfig TARGET_ROOTFS_INCLUDE_KERNEL
 		bool "Include kernel in root filesystem"
 		depends on TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
 		default n if USES_UBIFS
@@ -147,6 +181,30 @@ menu "Target Images"
 		  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 TARGET_ROOTFS_UBIFS || TARGET_ROOTFS_EXT4FS
@@ -879,6 +937,7 @@ 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