X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=cmd%2Fdisk.c;h=0883c79506cd44adad9cef839a5b1f58977b88a1;hb=e35929e4a1ffe861f2f45e107986568c56c4f077;hp=3025225c764264a899d2ecd40e4081ccbc713228;hpb=2e192b245ed36a63bab0ef576999a95e23f60ecd;p=oweals%2Fu-boot.git

diff --git a/cmd/disk.c b/cmd/disk.c
index 3025225c76..0883c79506 100644
--- a/cmd/disk.c
+++ b/cmd/disk.c
@@ -20,7 +20,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
 #if defined(CONFIG_IMAGE_FORMAT_LEGACY)
 	image_header_t *hdr;
 #endif
-	block_dev_desc_t *dev_desc;
+	struct blk_desc *dev_desc;
 
 #if defined(CONFIG_FIT)
 	const void *fit_hdr = NULL;
@@ -38,7 +38,7 @@ int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
 
 	bootstage_mark(BOOTSTAGE_ID_IDE_BOOT_DEVICE);
 
-	part = get_device_and_partition(intf, (argc == 3) ? argv[2] : NULL,
+	part = blk_get_device_part_str(intf, (argc == 3) ? argv[2] : NULL,
 					&dev_desc, &info, 1);
 	if (part < 0) {
 		bootstage_error(BOOTSTAGE_ID_IDE_TYPE);