diff --git a/doc/README.nand b/doc/README.nand
index 320d752952..e29188f1ec 100644
--- a/doc/README.nand
+++ b/doc/README.nand
@@ -215,12 +215,6 @@ Configuration Options:
 
 Platform specific options
 =========================
-   CONFIG_NAND_DENALI
-	Enables the denali.c driver.
-
-   CONFIG_SYS_NAND_DENALI_64BIT
-	Indicates that the Denali NAND controller is the 64-bit variant.
-
    CONFIG_NAND_OMAP_GPMC
 	Enables omap_gpmc.c driver for OMAPx and AMxxxx platforms.
 	GPMC controller is used for parallel NAND flash devices, and can
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index e69de29bb2..415ab4eba9 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -0,0 +1 @@
+source "drivers/mtd/nand/Kconfig"
diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
new file mode 100644
index 0000000000..1d9bf4802c
--- /dev/null
+++ b/drivers/mtd/nand/Kconfig
@@ -0,0 +1,32 @@
+menu "NAND Device Support"
+
+if !SPL_BUILD
+
+config NAND_DENALI
+	bool "Support Denali NAND controller"
+	help
+	  Enable support for the Denali NAND controller.
+
+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
+	range 0 63
+	help
+	  This option specifies the number of bytes to skip from the beginning
+	  of OOB area before last ECC sector data starts.  This is potentially
+	  used to preserve the bad block marker in the OOB area.
+
+endif
+
+endmenu