Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dd78632 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Artem Bityutskiy
Browse files

UBI: cleanup and simplify Kconfig 



Cleanup the Kconfig for UBI by using menuconfig to enable/disable the entire
driver. Remove the dependency checks for MTD_UBI and MTD_UBI_DEBUG by
wrapping the options in if/endif blocks and remove any redundant checks.
Remove all default n since that is the Kconfig default. Change menu "Additional
UBI debugging messages" into a comment to remove one menu level.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent cd07202c

drivers/mtd/ubi/Kconfig

+6 −11
Original line number Diff line number Diff line 
menu "UBI - Unsorted block images"

	depends on MTD



config MTD_UBI

	tristate "Enable UBI"

	depends on MTD

menuconfig MTD_UBI

	tristate "Enable UBI - Unsorted block images"

	select CRC32

	help

	  UBI is a software layer above MTD layer which admits of LVM-like
@@ -12,11 +8,12 @@ config MTD_UBI 
	  capabilities. Please, consult the MTD web site for more details

	  (www.linux-mtd.infradead.org).



if MTD_UBI



config MTD_UBI_WL_THRESHOLD

	int "UBI wear-leveling threshold"

	default 4096

	range 2 65536

	depends on MTD_UBI

	help

	  This parameter defines the maximum difference between the highest

	  erase counter value and the lowest erase counter value of eraseblocks
@@ -34,7 +31,6 @@ config MTD_UBI_BEB_RESERVE 
	int "Percentage of reserved eraseblocks for bad eraseblocks handling"

	default 1

	range 0 25

	depends on MTD_UBI

	help

	  If the MTD device admits of bad eraseblocks (e.g. NAND flash), UBI

	  reserves some amount of physical eraseblocks to handle new bad
@@ -48,8 +44,6 @@ config MTD_UBI_BEB_RESERVE 


config MTD_UBI_GLUEBI

	tristate "MTD devices emulation driver (gluebi)"

	default n

	depends on MTD_UBI

	help

	   This option enables gluebi - an additional driver which emulates MTD

	   devices on top of UBI volumes: for each UBI volumes an MTD device is
@@ -59,4 +53,5 @@ config MTD_UBI_GLUEBI 
	   software.



source "drivers/mtd/ubi/Kconfig.debug"

endmenu
 


endif # MTD_UBI

drivers/mtd/ubi/Kconfig.debug

+4 −25
Original line number Diff line number Diff line 
comment "UBI debugging options"

	depends on MTD_UBI



config MTD_UBI_DEBUG

	bool "UBI debugging"

	depends on SYSFS

	depends on MTD_UBI

	select DEBUG_FS

	select KALLSYMS_ALL if KALLSYMS && DEBUG_KERNEL

	help

	  This option enables UBI debugging.



if MTD_UBI_DEBUG



config MTD_UBI_DEBUG_MSG

	bool "UBI debugging messages"

	depends on MTD_UBI_DEBUG

	default n

	help

	  This option enables UBI debugging messages.



config MTD_UBI_DEBUG_PARANOID

	bool "Extra self-checks"

	default n

	depends on MTD_UBI_DEBUG

	help

	  This option enables extra checks in UBI code. Note this slows UBI down

	  significantly.



config MTD_UBI_DEBUG_DISABLE_BGT

	bool "Do not enable the UBI background thread"

	depends on MTD_UBI_DEBUG

	default n

	help

	  This option switches the background thread off by default. The thread

	  may be also be enabled/disabled via UBI sysfs.



config MTD_UBI_DEBUG_EMULATE_BITFLIPS

	bool "Emulate flash bit-flips"

	depends on MTD_UBI_DEBUG

	default n

	help

	  This option emulates bit-flips with probability 1/50, which in turn

	  causes scrubbing. Useful for debugging and stressing UBI.



config MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES

	bool "Emulate flash write failures"

	depends on MTD_UBI_DEBUG

	default n

	help

	  This option emulates write failures with probability 1/100. Useful for

	  debugging and testing how UBI handlines errors.



config MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES

	bool "Emulate flash erase failures"

	depends on MTD_UBI_DEBUG

	default n

	help

	  This option emulates erase failures with probability 1/100. Useful for

	  debugging and testing how UBI handlines errors.



menu "Additional UBI debugging messages"

	depends on MTD_UBI_DEBUG

comment "Additional UBI debugging messages"



config MTD_UBI_DEBUG_MSG_BLD

	bool "Additional UBI initialization and build messages"

	default n

	depends on MTD_UBI_DEBUG

	help

	  This option enables detailed UBI initialization and device build

	  debugging messages.



config MTD_UBI_DEBUG_MSG_EBA

	bool "Eraseblock association unit messages"

	default n

	depends on MTD_UBI_DEBUG

	help

	  This option enables debugging messages from the UBI eraseblock

	  association unit.



config MTD_UBI_DEBUG_MSG_WL

	bool "Wear-leveling unit messages"

	default n

	depends on MTD_UBI_DEBUG

	help

	  This option enables debugging messages from the UBI wear-leveling

	  unit.



config MTD_UBI_DEBUG_MSG_IO

	bool "Input/output unit messages"

	default n

	depends on MTD_UBI_DEBUG

	help

	  This option enables debugging messages from the UBI input/output unit.



endmenu # UBI debugging messages
 
endif # MTD_UBI_DEBUG