diff options
| author | Simon Glass <sjg@chromium.org> | 2022-08-11 19:34:48 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-16 11:05:16 -0400 |
| commit | 7f8967c2b82f9917987b69fbf43f8f591f3a8516 (patch) | |
| tree | 952913642a31420f44746abc3f734e4fea04d1c5 /drivers/block | |
| parent | 14d2c5d819bb9f011b518c5394af90c3d8e0d17f (diff) | |
| download | u-boot-7f8967c2b82f9917987b69fbf43f8f591f3a8516.zip u-boot-7f8967c2b82f9917987b69fbf43f8f591f3a8516.tar.gz u-boot-7f8967c2b82f9917987b69fbf43f8f591f3a8516.tar.bz2 | |
blk: Rename HAVE_BLOCK_DEVICE
This option is fact really related to SPL. For U-Boot proper we always use
driver model for block devices, so CONFIG_BLK is enabled if block devices
are in use.
It is only for SPL that we have two cases:
- SPL_BLK is enabled, in which case we use driver model and blk-uclass.c
- SPL_BLK is not enabled, in which case (if we need block devices) we must
use blk_legacy.c
Rename the symbol to SPL_LEGACY_BLOCK to make this clear. This is
different enough from BLK and SPL_BLK that there should be no confusion.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/Kconfig | 8 | ||||
| -rw-r--r-- | drivers/block/Makefile | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index df242df..5a0c434 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -11,7 +11,7 @@ config BLK be partitioned into several areas, called 'partitions' in U-Boot. A filesystem can be placed in each partition. -config HAVE_BLOCK_DEVICE +config SPL_LEGACY_BLOCK bool "Enable Legacy Block Device" help Some devices require block support whether or not DM is enabled @@ -109,7 +109,7 @@ endif # EFI_MEDIA config IDE bool "Support IDE controllers" - select HAVE_BLOCK_DEVICE + select SPL_LEGACY_BLOCK help Enables support for IDE (Integrated Drive Electronics) hard drives. This allows access to raw blocks and filesystems on an IDE drive @@ -222,7 +222,7 @@ endif # IDE config LBA48 bool "Enable LBA support for disks larger than 137GB" - depends on HAVE_BLOCK_DEVICE + depends on SPL_LEGACY_BLOCK help Set this to enable support for disks larger than 137GB. Also look at CONFIG_SYS_64BIT_LBA. Without both of these, LBA48 @@ -231,7 +231,7 @@ config LBA48 config SYS_64BIT_LBA bool "Enable 64bit number of blocks on a block device" - depends on HAVE_BLOCK_DEVICE + depends on SPL_LEGACY_BLOCK help Make the block subsystem use 64bit sector addresses, rather than the default of 32bit. diff --git a/drivers/block/Makefile b/drivers/block/Makefile index b221a7c..f48d3e1 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -6,7 +6,7 @@ obj-$(CONFIG_$(SPL_)BLK) += blk-uclass.o ifndef CONFIG_$(SPL_)BLK -obj-$(CONFIG_HAVE_BLOCK_DEVICE) += blk_legacy.o +obj-$(CONFIG_SPL_LEGACY_BLOCK) += blk_legacy.o endif ifndef CONFIG_SPL_BUILD |