aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorSimon Glass2022-08-11 19:34:41 -0600
committerTom Rini2022-09-16 11:05:00 -0400
commit6b03b9d5b7b9efee81bdb01d17c291107818371e (patch)
treedfa27bf4d9064b911a06c3a2af032ac95db1a365 /drivers
parente7b1018dd377849780138a2b9aae59cf840fade6 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/Kconfig1
-rw-r--r--drivers/block/Kconfig3
-rw-r--r--drivers/nvme/Kconfig1
-rw-r--r--drivers/scsi/Kconfig1
-rw-r--r--drivers/virtio/Kconfig1
5 files changed, 2 insertions, 5 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 7715c403656..7d2315bd4a2 100644
--- 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 b5b482086af..df242df9c5f 100644
--- 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 0cb465160bb..2a103ab5ed7 100644
--- 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 c400e2de16a..19872fb52d8 100644
--- 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 586263ec884..852f6735b60 100644
--- 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.