Allow driver model to be used for block devices in SPL.

Signed-off-by: Simon Glass <s...@chromium.org>
---

 common/spl/spl_mmc.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index cf527da..5d0c9f9 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -30,9 +30,8 @@ static int mmc_load_legacy(struct mmc *mmc, ulong sector,
                             mmc->read_bl_len;
 
        /* Read the header too to avoid extra memcpy */
-       count = mmc->block_dev.block_read(&mmc->block_dev, sector,
-                                         image_size_sectors,
-                                         (void *)(ulong)spl_image.load_addr);
+       count = blk_dread(mmc_get_blk_desc(mmc), sector, image_size_sectors,
+                         (void *)(ulong)spl_image.load_addr);
        debug("read %x sectors to %x\n", image_size_sectors,
              spl_image.load_addr);
        if (count != image_size_sectors)
@@ -46,7 +45,7 @@ static ulong h_spl_load_read(struct spl_load_info *load, 
ulong sector,
 {
        struct mmc *mmc = load->dev;
 
-       return mmc->block_dev.block_read(&mmc->block_dev, sector, count, buf);
+       return blk_dread(mmc_get_blk_desc(mmc), sector, count, buf);
 }
 
 static int mmc_load_image_raw_sector(struct mmc *mmc, unsigned long sector)
@@ -59,7 +58,7 @@ static int mmc_load_image_raw_sector(struct mmc *mmc, 
unsigned long sector)
                                         sizeof(struct image_header));
 
        /* read image header to find the image size & load address */
-       count = mmc->block_dev.block_read(&mmc->block_dev, sector, 1, header);
+       count = blk_dread(mmc_get_blk_desc(mmc), sector, 1, header);
        debug("hdr read sector %lx, count=%lu\n", sector, count);
        if (count == 0) {
                ret = -EIO;
-- 
2.8.0.rc3.226.g39d4020

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to