diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-17 13:58:27 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-17 13:58:27 -0400 |
| commit | 4b6e1fda107e5244e80ebc41865650ac2873dc88 (patch) | |
| tree | f448089740af77c2987d12e2dd5b753b7659586f /common/spl | |
| parent | 27bec5c12757c80f598b704477c1bc6c250bcb4c (diff) | |
| parent | 341392dd115f1385c31bb0b034ec15f542730e30 (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl_mmc.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_sata.c | 2 | ||||
| -rw-r--r-- | common/spl/spl_usb.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index 360c754050..5676acdde3 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -300,7 +300,7 @@ int spl_mmc_load_image(u32 boot_device) if (part == 7) part = 0; - err = mmc_switch_part(0, part); + err = blk_dselect_hwpart(mmc_get_blk_desc(mmc), part); if (err) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT puts("spl: mmc partition switch failed\n"); diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c index 1719946ec5..9d8cc7c2dd 100644 --- a/common/spl/spl_sata.c +++ b/common/spl/spl_sata.c @@ -34,7 +34,7 @@ int spl_sata_load_image(void) } else { /* try to recognize storage devices immediately */ scsi_scan(0); - stor_dev = scsi_get_dev(0); + stor_dev = blk_get_devnum_by_type(IF_TYPE_SCSI, 0); if (!stor_dev) return -ENODEV; } diff --git a/common/spl/spl_usb.c b/common/spl/spl_usb.c index c42848e6fc..04fa66758c 100644 --- a/common/spl/spl_usb.c +++ b/common/spl/spl_usb.c @@ -39,7 +39,7 @@ int spl_usb_load_image(void) #ifdef CONFIG_USB_STORAGE /* try to recognize storage devices immediately */ usb_stor_curr_dev = usb_stor_scan(1); - stor_dev = usb_stor_get_dev(usb_stor_curr_dev); + stor_dev = blk_get_devnum_by_type(IF_TYPE_USB, usb_stor_curr_dev); if (!stor_dev) return -ENODEV; #endif |