Merge branch '2019-10-30-master-imports'

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

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index d98457e2239b1b018b15e2b2186071616410d00b..37f379d478036c9e1e2b3d64f68c5853ec7e2c7d 100644 (file)
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -22,11 +22,15 @@ config MTD_DEVICE
          Adds the MTD device infrastructure from the Linux kernel.
          Needed for mtdparts command support.
 
-config MTD_PARTITIONS
-       bool "Add MTD Partioning infrastructure"
+config FLASH_CFI_DRIVER
+       bool "Enable CFI Flash driver"
        help
-         Adds the MTD partitioning infrastructure from the Linux
-         kernel. Needed for UBI support.
+         The Common Flash Interface specification was developed by Intel,
+         AMD and other flash manufactures. It provides a universal method
+         for probing the capabilities of flash devices. If you wish to
+         support any device that is CFI-compliant, you need to enable this
+         option. Visit <http://www.amd.com/products/nvd/overview/cfi.html>
+         for more information on CFI.
 
 config CFI_FLASH
        bool "Enable Driver Model for CFI Flash driver"
@@ -39,6 +43,34 @@ config CFI_FLASH
          option. Visit <http://www.amd.com/products/nvd/overview/cfi.html>
          for more information on CFI.
 
+config SYS_FLASH_USE_BUFFER_WRITE
+       bool "Enable buffered writes to flash"
+       depends on FLASH_CFI_DRIVER
+       help
+         Use buffered writes to flash.
+
+config FLASH_CFI_MTD
+       bool "Enable CFI MTD driver"
+       depends on FLASH_CFI_DRIVER
+       help
+         This option enables the building of the cfi_mtd driver
+         in the drivers directory. The driver exports CFI flash
+         to the MTD layer.
+
+config SYS_FLASH_PROTECTION
+       bool "Use hardware flash protection"
+       depends on FLASH_CFI_DRIVER
+       help
+         If defined, hardware flash sectors protection is used
+         instead of U-Boot software protection.
+
+config SYS_FLASH_CFI
+       bool "Define extra elements in CFI for flash geometry"
+       depends on FLASH_CFI_DRIVER
+       help
+         Define if the flash driver uses extra elements in the
+         common flash structure for storing flash geometry.
+
 config ALTERA_QSPI
        bool "Altera Generic Quad SPI Controller"
        depends on MTD
@@ -62,6 +94,13 @@ config RENESAS_RPC_HF
          This enables access to Hyperflash memory through the Renesas
          RCar Gen3 RPC controller.
 
+config HBMC_AM654
+       bool "HyperBus controller driver for AM65x SoC"
+       depends on SYSCON
+       help
+        This is the driver for HyperBus controller on TI's AM65x and
+        other SoCs
+
 source "drivers/mtd/nand/Kconfig"
 
 source "drivers/mtd/spi/Kconfig"