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>
This commit is contained in:
Simon Glass 2022-08-11 19:34:41 -06:00 committed by Tom Rini
parent e7b1018dd3
commit 6b03b9d5b7
7 changed files with 3 additions and 6 deletions

View file

@ -1026,7 +1026,6 @@ config ARCH_NPCM
config ARCH_APPLE config ARCH_APPLE
bool "Apple SoCs" bool "Apple SoCs"
select ARM64 select ARM64
select BLK
select CLK select CLK
select CMD_USB select CMD_USB
select DM select DM

View file

@ -25,6 +25,7 @@ CONFIG_CMD_EXT2=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_MAC_PARTITION=y CONFIG_MAC_PARTITION=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
# CONFIG_BLOCK_CACHE is not set
CONFIG_SYS_IDE_MAXBUS=1 CONFIG_SYS_IDE_MAXBUS=1
CONFIG_SYS_ATA_STRIDE=4 CONFIG_SYS_ATA_STRIDE=4
CONFIG_SYS_ATA_DATA_OFFSET=0xA0 CONFIG_SYS_ATA_DATA_OFFSET=0xA0

View file

@ -9,7 +9,6 @@ config AHCI
config SATA config SATA
bool "Support SATA controllers" bool "Support SATA controllers"
depends on BLK
select HAVE_BLOCK_DEVICE select HAVE_BLOCK_DEVICE
help help
This enables support for SATA (Serial Advanced Technology This enables support for SATA (Serial Advanced Technology

View file

@ -1,7 +1,8 @@
config BLK config BLK
bool "Support block devices" bool "Support block devices"
depends on DM 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 help
Enable support for block devices, such as SCSI, MMC and USB Enable support for block devices, such as SCSI, MMC and USB
flash sticks. These provide a block-level interface which permits flash sticks. These provide a block-level interface which permits

View file

@ -4,7 +4,6 @@
config NVME config NVME
bool "NVM Express device support" bool "NVM Express device support"
depends on BLK
select HAVE_BLOCK_DEVICE select HAVE_BLOCK_DEVICE
help help
This option enables support for NVM Express devices. This option enables support for NVM Express devices.

View file

@ -10,7 +10,6 @@ config SCSI
config DM_SCSI config DM_SCSI
bool "Support SCSI controllers with driver model" bool "Support SCSI controllers with driver model"
depends on BLK
help help
This option enables the SCSI (Small Computer System Interface) uclass This option enables the SCSI (Small Computer System Interface) uclass
which supports SCSI and SATA HDDs. For every device configuration which supports SCSI and SATA HDDs. For every device configuration

View file

@ -64,7 +64,6 @@ config VIRTIO_NET
config VIRTIO_BLK config VIRTIO_BLK
bool "virtio block driver" bool "virtio block driver"
depends on VIRTIO depends on VIRTIO
depends on BLK
help help
This is the virtual block driver for virtio. It can be used with This is the virtual block driver for virtio. It can be used with
QEMU based targets. QEMU based targets.