sunxi_nand_spl: Rename SPL_NAND_SUNXI to NAND_SUNXI

[karo-tx-uboot.git] / drivers / mtd / nand / Kconfig

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 507e6a9c0a5d6bb2fd539eab392918a90ed3855f..6a8f08e991a3bc71e83c78e70d5ec9ea71a516c4 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -62,6 +62,21 @@ config SYS_NAND_VF610_NFC_60_ECC_BYTES
 
 endchoice
 
+config NAND_PXA3XX
+       bool "Support for NAND on PXA3xx and Armada 370/XP/38x"
+       select SYS_NAND_SELF_INIT
+       help
+         This enables the driver for the NAND flash device found on
+         PXA3xx processors (NFCv1) and also on Armada 370/XP (NFCv2).
+
+config NAND_SUNXI
+       bool "Support for NAND on Allwinner SoCs in SPL"
+       depends on MACH_SUN4I || MACH_SUN5I || MACH_SUN7I
+       select SYS_NAND_SELF_INIT
+       ---help---
+       Enable support for NAND. This option allows SPL to read from
+       sunxi NAND using DMA transfers.
+
 comment "Generic NAND options"
 
 # Enhance depends when converting drivers to Kconfig which use this config
@@ -91,46 +106,14 @@ config SPL_NAND_DENALI
          This is a small implementation of the Denali NAND controller
          for use on SPL.
 
-config SPL_NAND_SUNXI
-       bool "Support for NAND on Allwinner A20 in SPL"
-       depends on MACH_SUN7I
-       ---help---
-       Enable support for NAND. This option allows SPL to read from
-       sunxi NAND using DMA transfers.
-       Depending on the NAND chip, values like ECC strength and page sizes
-       have to be configured.
-
 config NAND_SUNXI_SPL_SYNDROME_PARTITIONS_END
        hex "Size of syndrome partitions in sunxi NAND"
        default 0x400000
-       depends on SPL_NAND_SUNXI
+       depends on NAND_SUNXI
        ---help---
        End address for boot partitions on NAND. Those partitions have a
        different random seed that has to match the sunxi BROM setting.
 
-config NAND_SUNXI_SPL_ECC_STRENGTH
-       int "ECC Strength for sunxi NAND"
-       default 40
-       depends on SPL_NAND_SUNXI
-       ---help---
-       ECC strength used by the sunxi NAND SPL driver. This is specific to the
-       chosen NAND chip and has to match the value used by the sunxi BROM.
-
-config NAND_SUNXI_SPL_ECC_PAGE_SIZE
-       hex "ECC page size for sunxi NAND"
-       default 0x400
-       depends on SPL_NAND_SUNXI
-       ---help---
-       ECC page size used by the sunxi NAND SPL driver for syndrome partitions.
-       This setting has to match the value used by the sunxi BROM.
-
-config NAND_SUNXI_SPL_PAGE_SIZE
-       hex "Page size for sunxi NAND"
-       default 0x2000
-       depends on SPL_NAND_SUNXI
-       ---help---
-       Page size of the NAND flash used by the sunxi NAND SPL driver. This is
-       specific to the chosen NAND chip.
 endif
 
 config NAND_ATMEL