Merge tag 'xilinx-for-v2018.03' of git://git.denx.de/u-boot-microblaze

[oweals/u-boot.git] / drivers / mtd / nand / Kconfig

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index ca9819344ecc0788823ca78b936a0e8d9cbc6d41..97ec6cf5f9c34ff0a73dffe84bb350ee26d000dc 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -10,30 +10,18 @@ config SYS_NAND_SELF_INIT
          NAND initialization process.
 
 config NAND_DENALI
-       bool "Support Denali NAND controller"
+       bool
        select SYS_NAND_SELF_INIT
        imply CMD_NAND
-       help
-         Enable support for the Denali NAND controller.
 
 config NAND_DENALI_DT
        bool "Support Denali NAND controller as a DT device"
-       depends on NAND_DENALI && OF_CONTROL && DM
+       select NAND_DENALI
+       depends on OF_CONTROL && DM
        help
          Enable the driver for NAND flash on platforms using a Denali NAND
          controller as a DT device.
 
-config SYS_NAND_DENALI_64BIT
-       bool "Use 64-bit variant of Denali NAND controller"
-       depends on NAND_DENALI
-       help
-         The Denali NAND controller IP has some variations in terms of
-         the bus interface.  The DMA setup sequence is completely differenct
-         between 32bit / 64bit AXI bus variants.
-
-         If your Denali NAND controller is the 64-bit variant, say Y.
-         Otherwise (32 bit), say N.
-
 config NAND_DENALI_SPARE_AREA_SKIP_BYTES
        int "Number of bytes skipped in OOB area"
        depends on NAND_DENALI
@@ -135,6 +123,7 @@ endif
 
 config NAND_ARASAN
        bool "Configure Arasan Nand"
+       select SYS_NAND_SELF_INIT
        imply CMD_NAND
        help
          This enables Nand driver support for Arasan nand flash
@@ -165,6 +154,13 @@ config NAND_ZYNQ
          This enables Nand driver support for Nand flash controller
          found on Zynq SoC.
 
+config NAND_ZYNQ_USE_BOOTLOADER1_TIMINGS
+       bool "Enable use of 1st stage bootloader timing for NAND"
+       depends on NAND_ZYNQ
+       help
+         This flag prevent U-boot reconfigure NAND flash controller and reuse
+         the NAND timing from 1st stage bootloader.
+
 comment "Generic NAND options"
 
 # Enhance depends when converting drivers to Kconfig which use this config