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

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

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 80eea84..ca7692d 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -1,6 +1,7 @@
 config BLK
        bool "Support block devices"
        depends on DM
+       default y if DM_MMC
        help
          Enable support for block devices, such as SCSI, MMC and USB
          flash sticks. These provide a block-level interface which permits
@@ -9,15 +10,6 @@ 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 BLOCK_CACHE
        bool "Use block device cache"
        default n
@@ -26,3 +18,11 @@ config BLOCK_CACHE
          This is most useful when accessing filesystems under U-Boot since
          it will prevent repeated reads from directory structures and other
          filesystem data structures.
+
+config IDE
+       bool "Support IDE controllers"
+       help
+         Enables support for IDE (Integrated Drive Electronics) hard drives.
+         This allows access to raw blocks and filesystems on an IDE drive
+         from U-Boot. See also CMD_IDE which provides an 'ide' command for
+         performing various IDE operations.