Merge https://source.denx.de/u-boot/custodians/u-boot-sunxi

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

diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig
index 0969c03..096338f 100644 (file)
--- a/drivers/mtd/spi/Kconfig
+++ b/drivers/mtd/spi/Kconfig
@@ -97,6 +97,13 @@ config SPI_FLASH_SMART_HWCAPS
         can support a type of operation in a much more refined way compared
         to using flags like SPI_RX_DUAL, SPI_TX_QUAD, etc.
 
+config SPI_NOR_BOOT_SOFT_RESET_EXT_INVERT
+       bool "Command extension type is INVERT for Software Reset on boot"
+       default n
+       help
+        Because of SFDP information can not be get before boot.
+        So define command extension type is INVERT when Software Reset on boot only.
+
 config SPI_FLASH_SOFT_RESET
        bool "Software Reset support for SPI NOR flashes"
        help
@@ -129,12 +136,6 @@ config SPI_FLASH_UNLOCK_ALL
         For legacy reasons, this option default to y. But if you intend to
         actually use the software protection bits you should say n here.
 
-config SF_DUAL_FLASH
-       bool "SPI DUAL flash memory support"
-       help
-         Enable this option to support two flash memories connected to a single
-         controller. Currently Xilinx Zynq qspi supports this.
-
 config SPI_FLASH_ATMEL
        bool "Atmel SPI flash support"
        help
@@ -254,7 +255,7 @@ config SPI_FLASH_MTD
 
 config SPL_SPI_FLASH_MTD
        bool "SPI flash MTD support for SPL"
-       depends on SPI_FLASH
+       depends on SPI_FLASH && SPL
        help
           Enable the MTD support for the SPI flash layer in SPL.