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

Commit 714c0682 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

mtd: nand: Clarify Kconfig entry for software BCH ECC algorithm 



There is no point in having two distinct entries, merge them and
rename the symbol for more clarity: MTD_NAND_ECC_SW_BCH

Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
parent e90a619f

arch/arm/configs/omap2plus_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -144,7 +144,7 @@ CONFIG_MTD_ONENAND=y 
CONFIG_MTD_ONENAND_VERIFY_WRITE=y

CONFIG_MTD_ONENAND_VERIFY_WRITE=y

CONFIG_MTD_ONENAND_OMAP2=y

CONFIG_MTD_ONENAND_OMAP2=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ECC_BCH=y

CONFIG_MTD_NAND_ECC_SW_BCH=y

CONFIG_MTD_NAND_OMAP2=y

CONFIG_MTD_NAND_OMAP2=y

CONFIG_MTD_NAND_OMAP_BCH=y

CONFIG_MTD_NAND_OMAP_BCH=y

CONFIG_MTD_SPI_NOR=m

CONFIG_MTD_SPI_NOR=m

arch/arm/configs/pxa_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -186,7 +186,7 @@ CONFIG_MTD_M25P80=m 
CONFIG_MTD_BLOCK2MTD=y

CONFIG_MTD_BLOCK2MTD=y

CONFIG_MTD_DOCG3=m

CONFIG_MTD_DOCG3=m

CONFIG_MTD_NAND=m

CONFIG_MTD_NAND=m

CONFIG_MTD_NAND_ECC_BCH=y

CONFIG_MTD_NAND_ECC_SW_BCH=y

CONFIG_MTD_NAND_GPIO=m

CONFIG_MTD_NAND_GPIO=m

CONFIG_MTD_NAND_DISKONCHIP=m

CONFIG_MTD_NAND_DISKONCHIP=m

CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y

CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED=y

arch/mips/configs/db1xxx_defconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -96,7 +96,7 @@ CONFIG_MTD_PHYSMAP=y 
CONFIG_MTD_M25P80=y

CONFIG_MTD_M25P80=y

CONFIG_MTD_SST25L=y

CONFIG_MTD_SST25L=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_ECC_BCH=y

CONFIG_MTD_NAND_ECC_SW_BCH=y

CONFIG_MTD_NAND_AU1550=y

CONFIG_MTD_NAND_AU1550=y

CONFIG_MTD_NAND_PLATFORM=y

CONFIG_MTD_NAND_PLATFORM=y

CONFIG_MTD_SPI_NOR=y

CONFIG_MTD_SPI_NOR=y

arch/mips/configs/generic/board-ni169445.config

+1 −1
Original line number Original line Diff line number Diff line
@@ -16,7 +16,7 @@ CONFIG_MTD_BLOCK=y 
CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_CMDLINE_PARTS=y





CONFIG_MTD_NAND_ECC=y

CONFIG_MTD_NAND_ECC=y

CONFIG_MTD_NAND_ECC_BCH=y

CONFIG_MTD_NAND_ECC_SW_BCH=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND=y

CONFIG_MTD_NAND_GPIO=y

CONFIG_MTD_NAND_GPIO=y

CONFIG_MTD_NAND_IDS=y

CONFIG_MTD_NAND_IDS=y

drivers/mtd/devices/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -207,7 +207,7 @@ comment "Disk-On-Chip Device Drivers" 
config MTD_DOCG3

config MTD_DOCG3

	tristate "M-Systems Disk-On-Chip G3"

	tristate "M-Systems Disk-On-Chip G3"

	select BCH

	select BCH

	select BCH_CONST_PARAMS if !MTD_NAND_BCH

	select BCH_CONST_PARAMS if !MTD_NAND_ECC_SW_BCH

	select BITREVERSE

	select BITREVERSE

	help

	help

	  This provides an MTD device driver for the M-Systems DiskOnChip

	  This provides an MTD device driver for the M-Systems DiskOnChip