blk: Enable CONFIG_BLK for all media

Enable this option on all boards which support block devices. Drop the
related depencies on BLK since these are not needed anymore.

Disable BLOCK_CACHE on M5253DEMO as this causes a build error.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3649222..03169eb 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1026,7 +1026,6 @@ config ARCH_NPCM
 config ARCH_APPLE
        bool "Apple SoCs"
        select ARM64
-       select BLK
        select CLK
        select CMD_USB
        select DM

diff --git a/configs/M5253DEMO_defconfig b/configs/M5253DEMO_defconfig
index 79382eb..a73aca0 100644 (file)
--- a/configs/M5253DEMO_defconfig
+++ b/configs/M5253DEMO_defconfig
@@ -25,6 +25,7 @@ CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
 CONFIG_MAC_PARTITION=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+# CONFIG_BLOCK_CACHE is not set
 CONFIG_SYS_IDE_MAXBUS=1
 CONFIG_SYS_ATA_STRIDE=4
 CONFIG_SYS_ATA_DATA_OFFSET=0xA0

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 7715c40..7d2315b 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -9,7 +9,6 @@ config AHCI
 
 config SATA
        bool "Support SATA controllers"
-       depends on BLK
        select HAVE_BLOCK_DEVICE
        help
          This enables support for SATA (Serial Advanced Technology

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index b5b4820..df242df 100644 (file)
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -1,7 +1,8 @@
 config BLK
        bool "Support block devices"
        depends on DM
-       default y if DM_MMC || DM_USB
+       default y if MMC || USB || SCSI || NVME || IDE || AHCI || SATA
+       default y if EFI_MEDIA || VIRTIO_BLK || PVBLOCK
        help
          Enable support for block devices, such as SCSI, MMC and USB
          flash sticks. These provide a block-level interface which permits

diff --git a/drivers/nvme/Kconfig b/drivers/nvme/Kconfig
index 0cb4651..2a103ab 100644 (file)
--- a/drivers/nvme/Kconfig
+++ b/drivers/nvme/Kconfig
@@ -4,7 +4,6 @@
 
 config NVME
        bool "NVM Express device support"
-       depends on BLK
        select HAVE_BLOCK_DEVICE
        help
          This option enables support for NVM Express devices.

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index c400e2d..19872fb 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -10,7 +10,6 @@ config SCSI
 
 config DM_SCSI
        bool "Support SCSI controllers with driver model"
-       depends on BLK
        help
          This option enables the SCSI (Small Computer System Interface) uclass
          which supports SCSI and SATA HDDs. For every device configuration

diff --git a/drivers/virtio/Kconfig b/drivers/virtio/Kconfig
index 586263e..852f673 100644 (file)
--- a/drivers/virtio/Kconfig
+++ b/drivers/virtio/Kconfig
@@ -64,7 +64,6 @@ config VIRTIO_NET
 config VIRTIO_BLK
        bool "virtio block driver"
        depends on VIRTIO
-       depends on BLK
        help
          This is the virtual block driver for virtio. It can be used with
          QEMU based targets.