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

Commit b928ed56 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6 

* 'for-linus' of git://git.infradead.org/ubi-2.6:
  UBI: remove unused variable
  UBI: add me to MAINTAINERS
  JFFS2: add UBI support
  UBI: Unsorted Block Images
parents ea6db58f d468a030

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -2246,6 +2246,14 @@ L: linux-mtd@lists.infradead.org 
T:	git git://git.infradead.org/mtd-2.6.git

S:	Maintained



UNSORTED BLOCK IMAGES (UBI)

P:	Artem Bityutskiy

M:	dedekind@infradead.org

W:	http://www.linux-mtd.infradead.org/

L:	linux-mtd@lists.infradead.org

T:	git git://git.infradead.org/ubi-2.6.git

S:	Maintained



MICROTEK X6 SCANNER

P:	Oliver Neukum

M:	oliver@neukum.name

drivers/mtd/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -292,5 +292,7 @@ source "drivers/mtd/nand/Kconfig" 


source "drivers/mtd/onenand/Kconfig"



source "drivers/mtd/ubi/Kconfig"



endmenu

drivers/mtd/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -28,3 +28,5 @@ nftl-objs := nftlcore.o nftlmount.o 
inftl-objs		:= inftlcore.o inftlmount.o



obj-y		+= chips/ maps/ devices/ nand/ onenand/



obj-$(CONFIG_MTD_UBI)		+= ubi/

drivers/mtd/ubi/Kconfig

0 → 100644
+58 −0
Original line number Diff line number Diff line 
# drivers/mtd/ubi/Kconfig



menu "UBI - Unsorted block images"

	depends on MTD



config MTD_UBI

	tristate "Enable UBI"

	depends on MTD

	select CRC32

	help

	  UBI is a software layer above MTD layer which admits of LVM-like

	  logical volumes on top of MTD devices, hides some complexities of

	  flash chips like wear and bad blocks and provides some other useful

	  capabilities. Please, consult the MTD web site for more details

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



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

	  of UBI devices. When this threshold is exceeded, UBI starts performing

	  wear leveling by means of moving data from eraseblock with low erase

	  counter to eraseblocks with high erase counter. Leave the default

	  value if unsure.



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

	  eraseblocks. For example, if a flash physical eraseblock becomes bad,

	  UBI uses these reserved physical eraseblocks to relocate the bad one.

	  This option specifies how many physical eraseblocks will be reserved

	  for bad eraseblock handling (percents of total number of good flash

	  eraseblocks). If the underlying flash does not admit of bad

	  eraseblocks (e.g. NOR flash), this value is ignored and nothing is

	  reserved. Leave the default value if unsure.



config MTD_UBI_GLUEBI

	bool "Emulate MTD devices"

	default n

	depends on MTD_UBI

	help

	   This option enables MTD devices emulation on top of UBI volumes: for

	   each UBI volumes an MTD device is created, and all I/O to this MTD

	   device is redirected to the UBI volume. This is handy to make

	   MTD-oriented software (like JFFS2) work on top of UBI. Do not enable

	   this if no legacy software will be used.



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

endmenu

drivers/mtd/ubi/Kconfig.debug

0 → 100644
+104 −0
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

	help

	  This option enables UBI debugging.



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_USERSPACE_IO

	bool "Direct user-space write/erase support"

	default n

	depends on MTD_UBI_DEBUG

	help

	  By default, users cannot directly write and erase individual

	  eraseblocks of dynamic volumes, and have to use update operation

	  instead. This option enables this capability - it is very useful for

	  debugging and testing.



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



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