diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2017-12-11 12:56:39 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2017-12-16 23:07:55 +0100 |
| commit | 66b051d51f3f35ab48a8e978a2a28a55b4d13208 (patch) | |
| tree | cab4c58556a3937984f2187443d9b9870b66c33d /lib | |
| parent | b9b17598f42c29b905a8b4a778e505244a89bd9a (diff) | |
| download | u-boot-66b051d51f3f35ab48a8e978a2a28a55b4d13208.zip u-boot-66b051d51f3f35ab48a8e978a2a28a55b4d13208.tar.gz u-boot-66b051d51f3f35ab48a8e978a2a28a55b4d13208.tar.bz2 | |
efi_loader: correctly determine if an MMC device is an SD-card
The SD cards and eMMC devices have different device nodes.
The current coding interpretes all MMC devices as eMMC.
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_loader/efi_device_path.c | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index 24a4f40..50330dd 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -36,6 +36,24 @@ static const struct efi_device_path_vendor ROOT = { .guid = U_BOOT_GUID, }; +#if defined(CONFIG_DM_MMC) && defined(CONFIG_MMC) +/* + * Determine if an MMC device is an SD card. + * + * @desc block device descriptor + * @return true if the device is an SD card + */ +static bool is_sd(struct blk_desc *desc) +{ + struct mmc *mmc = find_mmc_device(desc->devnum); + + if (!mmc) + return false; + + return IS_SD(mmc) != 0U; +} +#endif + static void *dp_alloc(size_t sz) { void *buf; @@ -313,9 +331,9 @@ static void *dp_fill(void *buf, struct udevice *dev) struct blk_desc *desc = mmc_get_blk_desc(mmc); sddp->dp.type = DEVICE_PATH_TYPE_MESSAGING_DEVICE; - sddp->dp.sub_type = (desc->if_type == IF_TYPE_MMC) ? - DEVICE_PATH_SUB_TYPE_MSG_MMC : - DEVICE_PATH_SUB_TYPE_MSG_SD; + sddp->dp.sub_type = is_sd(desc) ? + DEVICE_PATH_SUB_TYPE_MSG_SD : + DEVICE_PATH_SUB_TYPE_MSG_MMC; sddp->dp.length = sizeof(*sddp); sddp->slot_number = dev->seq; |