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>
diff --git a/drivers/Makefile b/drivers/Makefile
index f2154e1..9d9f69a 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -59,7 +59,7 @@
obj-$(CONFIG_SPL_USB_HOST) += usb/host/
obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/
obj-$(CONFIG_SPL_SATA) += ata/ scsi/
-obj-$(CONFIG_HAVE_BLOCK_DEVICE) += block/
+obj-$(CONFIG_SPL_LEGACY_BLOCK) += block/
obj-$(CONFIG_SPL_BLK) += block/
obj-$(CONFIG_SPL_THERMAL) += thermal/
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 70e6bd3..c3f2ac0 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -9,7 +9,7 @@
config SATA
bool "Support SATA controllers"
- select HAVE_BLOCK_DEVICE
+ select SPL_LEGACY_BLOCK
help
This enables support for SATA (Serial Advanced Technology
Attachment), a serial bus standard for connecting to hard drives and
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 @@
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 @@
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 @@
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 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
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 0dcec8a..5cd2975 100644
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -3,7 +3,7 @@
config MMC
bool "MMC/SD/SDIO card support"
default ARM || PPC || SANDBOX
- select HAVE_BLOCK_DEVICE
+ select SPL_LEGACY_BLOCK
select DM_MMC if DM
help
This selects MultiMediaCard, Secure Digital and Secure
diff --git a/drivers/nvme/Kconfig b/drivers/nvme/Kconfig
index 2a103ab..7b6d546 100644
--- a/drivers/nvme/Kconfig
+++ b/drivers/nvme/Kconfig
@@ -4,7 +4,7 @@
config NVME
bool "NVM Express device support"
- select HAVE_BLOCK_DEVICE
+ select SPL_LEGACY_BLOCK
help
This option enables support for NVM Express devices.
It supports basic functions of NVMe (read/write).
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 19872fb..4d64381 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1,6 +1,6 @@
config SCSI
bool "Support SCSI controllers"
- select HAVE_BLOCK_DEVICE
+ select SPL_LEGACY_BLOCK
help
This enables support for SCSI (Small Computer System Interface),
a parallel interface widely used with storage peripherals such as
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 6ad2a93..20db2c5 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -2,7 +2,7 @@
bool "Xen para-virtualized block device"
depends on DM
select BLK
- select HAVE_BLOCK_DEVICE
+ select SPL_LEGACY_BLOCK
help
This driver implements the front-end of the Xen virtual
block device driver. It communicates with a back-end driver