diff options
| author | Simon Glass <sjg@chromium.org> | 2022-08-11 19:34:59 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-09-16 11:05:16 -0400 |
| commit | e33a5c6be55e7c012b2851f9bdf90e7f607e72bf (patch) | |
| tree | 19041e9f1b54a5d2811c96e88132ba44fe31243b /include | |
| parent | adbfe8edc3389ba635229195a95217d8b0dfa182 (diff) | |
| download | u-boot-e33a5c6be55e7c012b2851f9bdf90e7f607e72bf.zip u-boot-e33a5c6be55e7c012b2851f9bdf90e7f607e72bf.tar.gz u-boot-e33a5c6be55e7c012b2851f9bdf90e7f607e72bf.tar.bz2 | |
blk: Switch over to using uclass IDs
We currently have an if_type (interface type) and a uclass id. These are
closely related and we don't need to have both.
Drop the if_type values and use the uclass ones instead.
Maintain the existing, subtle, one-way conversion between UCLASS_USB and
UCLASS_MASS_STORAGE for now, and add a comment.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/blk.h | 18 | ||||
| -rw-r--r-- | include/mmc.h | 2 |
2 files changed, 3 insertions, 17 deletions
diff --git a/include/blk.h b/include/blk.h index cc30e38..548cd09 100644 --- a/include/blk.h +++ b/include/blk.h @@ -7,6 +7,7 @@ #ifndef BLK_H #define BLK_H +#include <dm/uclass-id.h> #include <efi.h> #ifdef CONFIG_SYS_64BIT_LBA @@ -27,22 +28,7 @@ static inline bool blk_enabled(void) } /* Interface types: */ -enum if_type { - IF_TYPE_UNKNOWN = 0, - IF_TYPE_IDE, - IF_TYPE_SCSI, - IF_TYPE_USB, - IF_TYPE_MMC, - IF_TYPE_SATA, - IF_TYPE_HOST, - IF_TYPE_NVME, - IF_TYPE_EFI_LOADER, - IF_TYPE_PVBLOCK, - IF_TYPE_VIRTIO, - IF_TYPE_EFI_MEDIA, - - IF_TYPE_COUNT, /* Number of interface types */ -}; +#define if_type uclass_id #define BLK_VEN_SIZE 40 #define BLK_PRD_SIZE 20 diff --git a/include/mmc.h b/include/mmc.h index f519d86..027e8bc 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -767,7 +767,7 @@ struct mmc *mmc_create(const struct mmc_config *cfg, void *priv); /** * mmc_bind() - Set up a new MMC device ready for probing * - * A child block device is bound with the IF_TYPE_MMC interface type. This + * A child block device is bound with the UCLASS_MMC interface type. This * allows the device to be used with CONFIG_BLK * * @dev: MMC device to set up |