Merge branch 'master' of git://git.denx.de/u-boot

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

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 75c2c06..72825c3 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -1,9 +1,14 @@
 menu "NAND Device Support"
 
 menu "NAND Device Support"
 

-if !SPL_BUILD
+config SYS_NAND_SELF_INIT
+       bool
+       help
+         This option, if enabled, provides more flexible and linux-like
+         NAND initialization process.

 
 config NAND_DENALI
        bool "Support Denali NAND controller"
 
 config NAND_DENALI
        bool "Support Denali NAND controller"

+       select SYS_NAND_SELF_INIT

        help
          Enable support for the Denali NAND controller.
 
        help
          Enable support for the Denali NAND controller.
 


@@ -27,9 +32,7 @@ config NAND_DENALI_SPARE_AREA_SKIP_BYTES
          of OOB area before last ECC sector data starts.  This is potentially
          used to preserve the bad block marker in the OOB area.
 
          of OOB area before last ECC sector data starts.  This is potentially
          used to preserve the bad block marker in the OOB area.
 

-endif
-
-if SPL_BUILD
+if SPL

 
 config SPL_NAND_DENALI
        bool "Support Denali NAND controller for SPL"
 
 config SPL_NAND_DENALI
        bool "Support Denali NAND controller for SPL"