cmd: Drop use of HAVE_BLOCK_DEVICE

This condition is not needed for these commands, since BLK is enabled for
all boards which use block devices and commands are not available in SPL,
so even if SPL_BLK is not enabled, it doesn't affect commands.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 08821b0bd4758ab29fbe77db660ee646221e34a3..6db76e9da8ccd23a2dec6ca0a89e6276b1441b18 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1092,7 +1092,6 @@ config CMD_PWM
 config CMD_GPT
        bool "GPT (GUID Partition Table) command"
        select EFI_PARTITION
-       select HAVE_BLOCK_DEVICE
        select PARTITION_UUIDS
        imply RANDOM_UUID
        help
@@ -1211,7 +1210,6 @@ config CMD_LSBLK
 config CMD_MBR
        bool "MBR (Master Boot Record) command"
        select DOS_PARTITION
-       select HAVE_BLOCK_DEVICE
        help
          Enable the 'mbr' command to ready and write MBR (Master Boot Record)
          style partition tables.
@@ -1343,7 +1341,6 @@ config CMD_OSD
 config CMD_PART
        bool "part"
        depends on PARTITIONS
-       select HAVE_BLOCK_DEVICE
        select PARTITION_UUIDS
        help
          Read and display information about the partition table on
@@ -1474,7 +1471,6 @@ config CMD_UNIVERSE
 config CMD_USB
        bool "usb"
        depends on USB_HOST
-       select HAVE_BLOCK_DEVICE
        help
          USB support.
 
@@ -1514,7 +1510,6 @@ config CMD_PVBLOCK
 config CMD_VIRTIO
        bool "virtio"
        depends on VIRTIO
-       depends on HAVE_BLOCK_DEVICE
        default y if VIRTIO
        help
          VirtIO block device support

diff --git a/cmd/Makefile b/cmd/Makefile
index 0ef4e2e46628eb91bc8ea13b09802d9f7acec7d0..cf6ce1bd6fdb1d508d0d33d0a993b35870aab471 100644 (file)
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -18,7 +18,7 @@ obj-$(CONFIG_CMD_AES) += aes.o
 obj-$(CONFIG_CMD_AB_SELECT) += ab_select.o
 obj-$(CONFIG_CMD_ADC) += adc.o
 obj-$(CONFIG_CMD_ARMFLASH) += armflash.o
-obj-$(CONFIG_HAVE_BLOCK_DEVICE) += blk_common.o
+obj-$(CONFIG_BLK) += blk_common.o
 obj-$(CONFIG_CMD_BOOTDEV) += bootdev.o
 obj-$(CONFIG_CMD_BOOTFLOW) += bootflow.o
 obj-$(CONFIG_CMD_BOOTMETH) += bootmeth.o