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 2f56d46..096338f 100644 (file)
--- a/drivers/mtd/spi/Kconfig
+++ b/drivers/mtd/spi/Kconfig
@@ -57,7 +57,7 @@ config SF_DEFAULT_CS
 config SF_DEFAULT_MODE
        hex "SPI Flash default mode (see include/spi.h)"
        depends on SPI_FLASH || DM_SPI_FLASH
-       default 0
+       default 0x0
        help
          The default mode may be provided by the platform
          to handle the common case when only a single serial
@@ -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
@@ -248,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.