Skip to content

Commit

Permalink
ARM: at91/defconfig: Remove unaffected config option
Browse files Browse the repository at this point in the history
The commit bf4289c removed the use of
CONFIG_MTD_NAND_ATMEL_ECC_NONE and CONFIG_MTD_NAND_ATMEL_ECC_HW but the
Kconfig file was forgotten.

This patch remove those inoperative options.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
  • Loading branch information
Richard Genoud authored and Nicolas Ferre committed Jul 2, 2012
1 parent 6887a41 commit b4084bc
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 44 deletions.
1 change: 0 additions & 1 deletion arch/arm/configs/afeb9260_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ CONFIG_MTD_BLOCK=y
CONFIG_MTD_DATAFLASH=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ATMEL=y
CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192
CONFIG_ATMEL_SSC=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/at91sam9263_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ CONFIG_MTD_DATAFLASH=y
CONFIG_MTD_BLOCK2MTD=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ATMEL=y
CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_GLUEBI=y
CONFIG_BLK_DEV_LOOP=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/qil-a9260_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ CONFIG_MTD_BLOCK=y
CONFIG_MTD_DATAFLASH=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ATMEL=y
CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y
CONFIG_BLK_DEV_LOOP=y
# CONFIG_MISC_DEVICES is not set
CONFIG_SCSI=y
Expand Down
1 change: 0 additions & 1 deletion arch/arm/configs/usb-a9260_defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ CONFIG_MTD_BLOCK=y
CONFIG_MTD_DATAFLASH=y
CONFIG_MTD_NAND=y
CONFIG_MTD_NAND_ATMEL=y
CONFIG_MTD_NAND_ATMEL_ECC_SOFT=y
CONFIG_BLK_DEV_LOOP=y
# CONFIG_MISC_DEVICES is not set
CONFIG_SCSI=y
Expand Down
40 changes: 0 additions & 40 deletions drivers/mtd/nand/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -406,46 +406,6 @@ config MTD_NAND_ATMEL
help
Enables support for NAND Flash / Smart Media Card interface
on Atmel AT91 and AVR32 processors.
choice
prompt "ECC management for NAND Flash / SmartMedia on AT91 / AVR32"
depends on MTD_NAND_ATMEL

config MTD_NAND_ATMEL_ECC_HW
bool "Hardware ECC"
depends on ARCH_AT91SAM9263 || ARCH_AT91SAM9260 || AVR32
help
Use hardware ECC instead of software ECC when the chip
supports it.

The hardware ECC controller is capable of single bit error
correction and 2-bit random detection per page.

NB : hardware and software ECC schemes are incompatible.
If you switch from one to another, you'll have to erase your
mtd partition.

If unsure, say Y

config MTD_NAND_ATMEL_ECC_SOFT
bool "Software ECC"
help
Use software ECC.

NB : hardware and software ECC schemes are incompatible.
If you switch from one to another, you'll have to erase your
mtd partition.

config MTD_NAND_ATMEL_ECC_NONE
bool "No ECC (testing only, DANGEROUS)"
depends on DEBUG_KERNEL
help
No ECC will be used.
It's not a good idea and it should be reserved for testing
purpose only.

If unsure, say N

endchoice

config MTD_NAND_PXA3xx
tristate "Support for NAND flash devices on PXA3xx"
Expand Down

0 comments on commit b4084bc

Please sign in to comment.