blk: Select SPL_LEGACY_BLOCK automatically

Selecting this option can be handled in the Kconfig option itself, as it
is with BLK. Update this an drop the various 'select' clauses.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2022-08-11 19:34:49 -06:00 committed by Tom Rini
parent 7f8967c2b8
commit ca28baf17c
8 changed files with 7 additions and 12 deletions

View file

@ -792,7 +792,6 @@ config SPL_DM_MAILBOX
config SPL_MMC config SPL_MMC
bool "Support MMC" bool "Support MMC"
depends on MMC depends on MMC
select SPL_LEGACY_BLOCK
help help
Enable support for MMC (Multimedia Card) within SPL. This enables Enable support for MMC (Multimedia Card) within SPL. This enables
the MMC protocol implementation and allows any enabled drivers to the MMC protocol implementation and allows any enabled drivers to
@ -1318,7 +1317,6 @@ config SPL_THERMAL
config SPL_USB_HOST config SPL_USB_HOST
bool "Support USB host drivers" bool "Support USB host drivers"
select SPL_LEGACY_BLOCK
help help
Enable access to USB (Universal Serial Bus) host devices so that Enable access to USB (Universal Serial Bus) host devices so that
SPL can load U-Boot from a connected USB peripheral, such as a USB SPL can load U-Boot from a connected USB peripheral, such as a USB

View file

@ -9,7 +9,6 @@ config AHCI
config SATA config SATA
bool "Support SATA controllers" bool "Support SATA controllers"
select SPL_LEGACY_BLOCK
help help
This enables support for SATA (Serial Advanced Technology This enables support for SATA (Serial Advanced Technology
Attachment), a serial bus standard for connecting to hard drives and Attachment), a serial bus standard for connecting to hard drives and

View file

@ -13,8 +13,14 @@ config BLK
config SPL_LEGACY_BLOCK config SPL_LEGACY_BLOCK
bool "Enable Legacy Block Device" bool "Enable Legacy Block Device"
depends on SPL && !DM_SPL
default y if SPL_MMC || SPL_USB_STORAGE || SCSI || NVME || IDE
default y if SPL_AHCI_PCI
help help
Some devices require block support whether or not DM is enabled Some devices require block support whether or not DM is enabled. This
is only supported in SPL. With this, the blk uclass is not used, but
instead a legacy implementation of block devices is used, with all
devices consisting of 'struct blk_desc' records.
config SPL_BLK config SPL_BLK
bool "Support block devices in SPL" bool "Support block devices in SPL"
@ -109,7 +115,6 @@ endif # EFI_MEDIA
config IDE config IDE
bool "Support IDE controllers" bool "Support IDE controllers"
select SPL_LEGACY_BLOCK
help help
Enables support for IDE (Integrated Drive Electronics) hard drives. Enables support for IDE (Integrated Drive Electronics) hard drives.
This allows access to raw blocks and filesystems on an IDE drive This allows access to raw blocks and filesystems on an IDE drive
@ -222,7 +227,6 @@ endif # IDE
config LBA48 config LBA48
bool "Enable LBA support for disks larger than 137GB" bool "Enable LBA support for disks larger than 137GB"
depends on SPL_LEGACY_BLOCK
help help
Set this to enable support for disks larger than 137GB. Set this to enable support for disks larger than 137GB.
Also look at CONFIG_SYS_64BIT_LBA. Without both of these, LBA48 Also look at CONFIG_SYS_64BIT_LBA. Without both of these, LBA48
@ -231,7 +235,6 @@ config LBA48
config SYS_64BIT_LBA config SYS_64BIT_LBA
bool "Enable 64bit number of blocks on a block device" bool "Enable 64bit number of blocks on a block device"
depends on SPL_LEGACY_BLOCK
help help
Make the block subsystem use 64bit sector addresses, rather than the Make the block subsystem use 64bit sector addresses, rather than the
default of 32bit. default of 32bit.

View file

@ -3,7 +3,6 @@ menu "MMC Host controller Support"
config MMC config MMC
bool "MMC/SD/SDIO card support" bool "MMC/SD/SDIO card support"
default ARM || PPC || SANDBOX default ARM || PPC || SANDBOX
select SPL_LEGACY_BLOCK
select DM_MMC if DM select DM_MMC if DM
help help
This selects MultiMediaCard, Secure Digital and Secure This selects MultiMediaCard, Secure Digital and Secure

View file

@ -4,7 +4,6 @@
config NVME config NVME
bool "NVM Express device support" bool "NVM Express device support"
select SPL_LEGACY_BLOCK
help help
This option enables support for NVM Express devices. This option enables support for NVM Express devices.
It supports basic functions of NVMe (read/write). It supports basic functions of NVMe (read/write).

View file

@ -1,6 +1,5 @@
config SCSI config SCSI
bool "Support SCSI controllers" bool "Support SCSI controllers"
select SPL_LEGACY_BLOCK
help help
This enables support for SCSI (Small Computer System Interface), This enables support for SCSI (Small Computer System Interface),
a parallel interface widely used with storage peripherals such as a parallel interface widely used with storage peripherals such as

View file

@ -2,7 +2,6 @@ config PVBLOCK
bool "Xen para-virtualized block device" bool "Xen para-virtualized block device"
depends on DM depends on DM
select BLK select BLK
select SPL_LEGACY_BLOCK
help help
This driver implements the front-end of the Xen virtual This driver implements the front-end of the Xen virtual
block device driver. It communicates with a back-end driver block device driver. It communicates with a back-end driver

View file

@ -20,7 +20,6 @@ config EFI_LOADER
select EVENT_DYNAMIC select EVENT_DYNAMIC
select LIB_UUID select LIB_UUID
imply PARTITION_UUIDS imply PARTITION_UUIDS
select SPL_LEGACY_BLOCK
select REGEX select REGEX
imply FAT imply FAT
imply FAT_WRITE imply FAT_WRITE