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/common/spl/Kconfig b/common/spl/Kconfig
index 70d97815f0a1f6bb05cfb5d01d4d542139a229cd..222472a6fb30d8a3bda027f991ac99aaf64f521d 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -792,7 +792,7 @@ config SPL_DM_MAILBOX
 config SPL_MMC
        bool "Support MMC"
        depends on MMC
-       select HAVE_BLOCK_DEVICE
+       select SPL_LEGACY_BLOCK
        help
          Enable support for MMC (Multimedia Card) within SPL. This enables
          the MMC protocol implementation and allows any enabled drivers to
@@ -1318,7 +1318,7 @@ config SPL_THERMAL
 
 config SPL_USB_HOST
        bool "Support USB host drivers"
-       select HAVE_BLOCK_DEVICE
+       select SPL_LEGACY_BLOCK
        help
          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

diff --git a/configs/axm_defconfig b/configs/axm_defconfig
index dc262c95a3b5cc0ae3a7c40ce82132ff5dbb7535..293052b9019db48f22b09ed0c12bcb0b8e799630 100644 (file)
--- a/configs/axm_defconfig
+++ b/configs/axm_defconfig
@@ -80,7 +80,7 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_SPL_DM=y
 CONFIG_BLK=y
-CONFIG_HAVE_BLOCK_DEVICE=y
+CONFIG_SPL_LEGACY_BLOCK=y
 CONFIG_CLK=y
 CONFIG_CLK_AT91=y
 CONFIG_AT91_GPIO=y

diff --git a/configs/bcm968380gerg_ram_defconfig b/configs/bcm968380gerg_ram_defconfig
index a0924689e4d427b294af9f7c28eb5f150f0d0ce5..55d74266b7d85bf5941c60103440f5132226b35d 100644 (file)
--- a/configs/bcm968380gerg_ram_defconfig
+++ b/configs/bcm968380gerg_ram_defconfig
@@ -42,7 +42,7 @@ CONFIG_CMD_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 # CONFIG_NET is not set
 # CONFIG_DM_DEVICE_REMOVE is not set
-CONFIG_HAVE_BLOCK_DEVICE=y
+CONFIG_SPL_LEGACY_BLOCK=y
 CONFIG_BCM6345_GPIO=y
 CONFIG_LED=y
 CONFIG_LED_BCM6328=y

diff --git a/configs/gardena-smart-gateway-mt7688_defconfig b/configs/gardena-smart-gateway-mt7688_defconfig
index b9ee281be9f9ded952f6a4c989d0deff298e1fd1..fdfab14d53ecec27415744e01922746217c7473b 100644 (file)
--- a/configs/gardena-smart-gateway-mt7688_defconfig
+++ b/configs/gardena-smart-gateway-mt7688_defconfig
@@ -78,7 +78,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_SPL_DM=y
 # CONFIG_DM_DEVICE_REMOVE is not set
-CONFIG_HAVE_BLOCK_DEVICE=y
+CONFIG_SPL_LEGACY_BLOCK=y
 CONFIG_BOOTCOUNT_LIMIT=y
 CONFIG_LED=y
 CONFIG_LED_BLINK=y

diff --git a/configs/nsim_hs38_defconfig b/configs/nsim_hs38_defconfig
index 8e5e8ea305df9c4b5c092fd62d00ce7369b7f8a3..22690e7236d8bde108babf50504c8316c6d8d337 100644 (file)
--- a/configs/nsim_hs38_defconfig
+++ b/configs/nsim_hs38_defconfig
@@ -30,7 +30,8 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_USE_BOOTFILE=y
 CONFIG_BOOTFILE="uImage"
 CONFIG_BLK=y
-CONFIG_HAVE_BLOCK_DEVICE=y
+CONFIG_SPL_LEGACY_BLOCK=y
+CONFIG_DM_ETH=y
 CONFIG_DM_SERIAL=y
 CONFIG_DEBUG_UART_SHIFT=2
 CONFIG_SYS_NS16550=y

diff --git a/configs/qemu-ppce500_defconfig b/configs/qemu-ppce500_defconfig
index 172ac18351c809b4d9c592b888b74af061a759c6..4ef01572248be671387833abbd3f6ae25272a336 100644 (file)
--- a/configs/qemu-ppce500_defconfig
+++ b/configs/qemu-ppce500_defconfig
@@ -40,7 +40,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SIMPLE_BUS_CORRECT_RANGE=y
 CONFIG_BLK=y
-CONFIG_HAVE_BLOCK_DEVICE=y
+CONFIG_SPL_LEGACY_BLOCK=y
 CONFIG_LBA48=y
 CONFIG_CHIP_SELECTS_PER_CTRL=0
 CONFIG_MPC8XXX_GPIO=y

diff --git a/disk/Makefile b/disk/Makefile
index 458e21e3fb713fb5e77cd6e3c3834d538a19e05e..45588cf66e4bc645fe0def04291f9ca7592202f5 100644 (file)
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -10,8 +10,8 @@ ifdef CONFIG_$(SPL_TPL_)BLK
 obj-$(CONFIG_$(SPL_TPL_)PARTITIONS)  += disk-uclass.o
 endif
 
-# Must have BLK or HAVE_BLOCK_DEVICE to support partitions
-ifneq ($(CONFIG_$(SPL_TPL_)BLK),$(CONFIG_HAVE_BLOCK_DEVICE),)
+# Must have BLK or SPL_LEGACY_BLOCK to support partitions
+ifneq ($(CONFIG_$(SPL_TPL_)BLK),$(CONFIG_SPL_LEGACY_BLOCK),)
 obj-$(CONFIG_$(SPL_TPL_)MAC_PARTITION)   += part_mac.o
 obj-$(CONFIG_$(SPL_TPL_)DOS_PARTITION)   += part_dos.o
 obj-$(CONFIG_$(SPL_TPL_)ISO_PARTITION)   += part_iso.o

diff --git a/disk/disk-uclass.c b/disk/disk-uclass.c
index f3fb942a6b94cc46285aff2581a67e00d39ebc41..9351a5cfa6882fa52d8c03418ff954b4552554ab 100644 (file)
--- a/disk/disk-uclass.c
+++ b/disk/disk-uclass.c
@@ -27,8 +27,7 @@ int part_create_block_devices(struct udevice *blk_dev)
        struct udevice *dev;
        int ret;
 
-       if (!CONFIG_IS_ENABLED(PARTITIONS) ||
-           !CONFIG_IS_ENABLED(HAVE_BLOCK_DEVICE))
+       if (!CONFIG_IS_ENABLED(PARTITIONS) || !blk_enabled())
                return 0;
 
        if (device_get_uclass_id(blk_dev) != UCLASS_BLK)

diff --git a/doc/develop/driver-model/migration.rst b/doc/develop/driver-model/migration.rst
index 5a6043692585c9952ec3fbcd997c145fc57cb22b..742fea5515cc202d209a51a4305176fedd4eebb9 100644 (file)
--- a/doc/develop/driver-model/migration.rst
+++ b/doc/develop/driver-model/migration.rst
@@ -57,7 +57,7 @@ In concert with maintainers migrating their block device usage to the
 appropriate DM driver, CONFIG_BLK needs to be set as well.  The final deadline
 here coincides with the final deadline for migration of the various block
 subsystems.  At this point we will be able to audit and correct the logic in
-Kconfig around using CONFIG_PARTITIONS and CONFIG_HAVE_BLOCK_DEVICE and make
+Kconfig around using CONFIG_PARTITIONS and CONFIG_SPL_LEGACY_BLOCK and make
 use of CONFIG_BLK / CONFIG_SPL_BLK as needed.
 
 CONFIG_DM_SPI / CONFIG_DM_SPI_FLASH

diff --git a/drivers/Makefile b/drivers/Makefile
index f2154e15d6a71e1599c73895c8d48367b994db13..9d9f69a3c9a607ef5ef2f72e79c81636be55ddf9 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -59,7 +59,7 @@ obj-$(CONFIG_SPL_WATCHDOG) += watchdog/
 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 70e6bd321a6083be74e4e1fdba2098c6132bb64f..c3f2ac058a3aeb652a04a1f836882c0474145ef9 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -9,7 +9,7 @@ config AHCI
 
 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 df242df9c5fddcb3315fd4e8941471eda346020d..5a0c434058a384e48e79f75e0784fa9ec285006e 100644 (file)
--- 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 b221a7c6eead31ae5c3a4b7643cda5fecabc2e60..f48d3e1214065b257f37c0178ee45a504c88cc35 100644 (file)
--- 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 0dcec8adcee88e8ee8fbf37b2c0f08d892d56ca6..5cd29758bebc697a519311346309c33782cfc6af 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -3,7 +3,7 @@ menu "MMC Host controller Support"
 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 2a103ab5ed737a45cb0dd5b4bd338ee2cc436dab..7b6d54615f838afc650933c628c4b2ebf1a90628 100644 (file)
--- 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 19872fb52d8145f4415cd7d3800f02e07c57796f..4d643816fcce71b991dfde687527729c275b92e4 100644 (file)
--- 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 6ad2a9366823f20e423eeb5d4c94406a56e86d81..20db2c53065fc93426abe29a97c3d540bba67f7a 100644 (file)
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -2,7 +2,7 @@ config PVBLOCK
        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

diff --git a/include/blk.h b/include/blk.h
index 332481a90b8a530468b0fe83efb1037f6bf0287d..5bdffe74015200b1e155b612bd73e736c36b1688 100644 (file)
--- a/include/blk.h
+++ b/include/blk.h
@@ -23,7 +23,7 @@ struct udevice;
 
 static inline bool blk_enabled(void)
 {
-       return CONFIG_IS_ENABLED(BLK) || IS_ENABLED(CONFIG_HAVE_BLOCK_DEVICE);
+       return CONFIG_IS_ENABLED(BLK) || IS_ENABLED(CONFIG_SPL_LEGACY_BLOCK);
 }
 
 /* Interface types: */

diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig
index 5cfff8c56bc33ffc846f77590d71ea6b9102e175..c4e812594f2c3a1af0c8bd37e9cff7ade480389b 100644 (file)
--- a/lib/efi_loader/Kconfig
+++ b/lib/efi_loader/Kconfig
@@ -20,7 +20,7 @@ config EFI_LOADER
        select EVENT_DYNAMIC
        select LIB_UUID
        imply PARTITION_UUIDS
-       select HAVE_BLOCK_DEVICE
+       select SPL_LEGACY_BLOCK
        select REGEX
        imply FAT
        imply FAT_WRITE