Browse Source

fs/ubifs: factorize all the "depends on" into "if...endif" blocks

Factorize all the "depends on" into "if...endif" blocks

All the UBIFS options use "depends on BR2_TARGET_ROOTFS_UBIFS" but
we can simplify the config file by enclosing them in an "if..endif"
block.

Signed-off-by: Mark Jackson <mpfj@newflow.co.uk>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Mark Jackson 12 years ago
parent
commit
a3e3909bce
1 changed files with 8 additions and 10 deletions
  1. 8 10
      fs/ubifs/Config.in

+ 8 - 10
fs/ubifs/Config.in

@@ -3,21 +3,20 @@ config BR2_TARGET_ROOTFS_UBIFS
 	help
 	help
 	  Build a ubifs root filesystem
 	  Build a ubifs root filesystem
 
 
+if BR2_TARGET_ROOTFS_UBIFS
+
 config BR2_TARGET_ROOTFS_UBIFS_LEBSIZE
 config BR2_TARGET_ROOTFS_UBIFS_LEBSIZE
 	hex "UBI logical erase block size"
 	hex "UBI logical erase block size"
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	default 0x1f800
 	default 0x1f800
 
 
 config BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE
 config BR2_TARGET_ROOTFS_UBIFS_MINIOSIZE
 	hex "UBI minimum I/O size"
 	hex "UBI minimum I/O size"
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	default 0x800
 	default 0x800
 	help
 	help
 	  Some comment required here
 	  Some comment required here
 
 
 config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT
 config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT
 	int "Maximum LEB count"
 	int "Maximum LEB count"
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	default 2048
 	default 2048
 	help
 	help
 	  Some comment required here
 	  Some comment required here
@@ -25,7 +24,6 @@ config BR2_TARGET_ROOTFS_UBIFS_MAXLEBCNT
 choice
 choice
 	prompt "ubifs runtime compression"
 	prompt "ubifs runtime compression"
 	default BR2_TARGET_ROOTFS_UBIFS_RT_LZO
 	default BR2_TARGET_ROOTFS_UBIFS_RT_LZO
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	help
 	help
 	  Select which compression format to use at run-time within
 	  Select which compression format to use at run-time within
 	  the ubifs file system.
 	  the ubifs file system.
@@ -50,7 +48,6 @@ endchoice
 choice
 choice
 	prompt "Compression method"
 	prompt "Compression method"
 	default BR2_TARGET_ROOTFS_UBIFS_NONE
 	default BR2_TARGET_ROOTFS_UBIFS_NONE
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	help
 	help
 	  Select which compression format to compress the final image
 	  Select which compression format to compress the final image
 	  into.
 	  into.
@@ -89,19 +86,18 @@ endchoice
 
 
 config BR2_TARGET_ROOTFS_UBIFS_OPTS
 config BR2_TARGET_ROOTFS_UBIFS_OPTS
 	string "Additional mkfs.ubifs options"
 	string "Additional mkfs.ubifs options"
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	help
 	help
 	  Any additional mkfs.ubifs options you may want to include.
 	  Any additional mkfs.ubifs options you may want to include.
 
 
 config BR2_TARGET_ROOTFS_UBI
 config BR2_TARGET_ROOTFS_UBI
-	depends on BR2_TARGET_ROOTFS_UBIFS
 	bool "Embed into an UBI image"
 	bool "Embed into an UBI image"
 	help
 	help
 	  Build an ubi image from the ubifs one (with ubinize).
 	  Build an ubi image from the ubifs one (with ubinize).
 
 
+if BR2_TARGET_ROOTFS_UBI
+
 config BR2_TARGET_ROOTFS_UBI_PEBSIZE
 config BR2_TARGET_ROOTFS_UBI_PEBSIZE
 	hex "UBI physical erase block size"
 	hex "UBI physical erase block size"
-	depends on BR2_TARGET_ROOTFS_UBI
 	default 0x20000
 	default 0x20000
 	help
 	help
 	  Tells ubinize the physical eraseblock size of the flash chip
 	  Tells ubinize the physical eraseblock size of the flash chip
@@ -109,7 +105,6 @@ config BR2_TARGET_ROOTFS_UBI_PEBSIZE
 
 
 config BR2_TARGET_ROOTFS_UBI_SUBSIZE
 config BR2_TARGET_ROOTFS_UBI_SUBSIZE
 	int "UBI sub-page size"
 	int "UBI sub-page size"
-	depends on BR2_TARGET_ROOTFS_UBI
 	default 512
 	default 512
 	help
 	help
 	  Tells ubinize that the flash supports sub-pages and the sub-page
 	  Tells ubinize that the flash supports sub-pages and the sub-page
@@ -117,6 +112,9 @@ config BR2_TARGET_ROOTFS_UBI_SUBSIZE
 
 
 config BR2_TARGET_ROOTFS_UBI_OPTS
 config BR2_TARGET_ROOTFS_UBI_OPTS
 	string "Additional ubinize options"
 	string "Additional ubinize options"
-	depends on BR2_TARGET_ROOTFS_UBI
 	help
 	help
 	  Any additional ubinize options you may want to include.
 	  Any additional ubinize options you may want to include.
+
+endif # BR2_TARGET_ROOTFS_UBI
+
+endif # BR2_TARGET_ROOTFS_UBIFS