Merge git://git.denx.de/u-boot-sunxi

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

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 931defd2aede9bb6b55be60d0de7a8f011c1801b..26760895f99dd53370f9077f5b7213a1a6f241fe 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -10,23 +10,17 @@ config BLK
          be partitioned into several areas, called 'partitions' in U-Boot.
          A filesystem can be placed in each partition.
 
-config AHCI
-       bool "Support SATA controllers with driver model"
-       depends on DM
-       help
-         This enables a uclass for disk controllers in U-Boot. Various driver
-         types can use this, such as AHCI/SATA. It does not provide any standard
-         operations at present. The block device interface has not been converted
-         to driver model.
-
-config DM_SCSI
-       bool "Support SCSI controllers with driver model"
-       depends on BLK
+config SPL_BLK
+       bool "Support block devices in SPL"
+       depends on SPL_DM && BLK
+       default y
        help
-         This option enables the SCSI (Small Computer System Interface) uclass
-         which supports SCSI and SATA HDDs. For every device configuration
-         (IDs/LUNs) a block device is created with RAW read/write and
-         filesystem support.
+         Enable support for block devices, such as SCSI, MMC and USB
+         flash sticks. These provide a block-level interface which permits
+         reading, writing and (in some cases) erasing blocks. Block
+         devices often have a partition table which allows the device to
+         be partitioned into several areas, called 'partitions' in U-Boot.
+         A filesystem can be placed in each partition.
 
 config BLOCK_CACHE
        bool "Use block device cache"
@@ -37,29 +31,6 @@ config BLOCK_CACHE
          it will prevent repeated reads from directory structures and other
          filesystem data structures.
 
-menu "SATA/SCSI device support"
-
-config SATA_CEVA
-       bool "Ceva Sata controller"
-       depends on AHCI
-       depends on DM_SCSI
-       help
-         This option enables Ceva Sata controller hard IP available on Xilinx
-         ZynqMP. Support up to 2 external devices. Complient with SATA 3.1 and
-         AHCI 1.3 specifications with hot-plug detect feature.
-
-
-config DWC_AHCI
-       bool "Enable Synopsys DWC AHCI driver support"
-       select SCSI_AHCI
-       select PHY
-       depends on DM_SCSI
-       help
-         Enable this driver to support Sata devices through
-         Synopsys DWC AHCI module.
-
-endmenu
-
 config IDE
        bool "Support IDE controllers"
        help