diff options
| author | Simon Glass <sjg@chromium.org> | 2016-06-12 23:30:32 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-07-11 14:06:44 -0600 |
| commit | 87bce4e5c0b55452d70830928b2d7b98fa24d4e3 (patch) | |
| tree | 6ee4825cc786fe61a336ba38a29687124961c899 | |
| parent | 4b00bdb7a471fc4414c3957726c3cf13c2ca3445 (diff) | |
| download | u-boot-imx-87bce4e5c0b55452d70830928b2d7b98fa24d4e3.zip u-boot-imx-87bce4e5c0b55452d70830928b2d7b98fa24d4e3.tar.gz u-boot-imx-87bce4e5c0b55452d70830928b2d7b98fa24d4e3.tar.bz2 | |
dm: spl: mmc: Support CONFIG_BLK in SPL MMC
Update the method of accessing the block device so that it works with
CONFIG_BLK enabled.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | common/spl/spl_mmc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index c44f1b5..6b3e9e4 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -184,7 +184,7 @@ static int mmc_load_image_raw_os(struct mmc *mmc) unsigned long count; int ret; - count = mmc->block_dev.block_read(&mmc->block_dev, + count = blk_dread(mmc_get_blk_desc(mmc), CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR, CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS, (void *) CONFIG_SYS_SPL_ARGS_ADDR); @@ -225,13 +225,13 @@ int spl_mmc_do_fs_boot(struct mmc *mmc) #ifdef CONFIG_SPL_FAT_SUPPORT if (!spl_start_uboot()) { - err = spl_load_image_fat_os(&mmc->block_dev, + err = spl_load_image_fat_os(mmc_get_blk_desc(mmc), CONFIG_SYS_MMCSD_FS_BOOT_PARTITION); if (!err) return err; } #ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME - err = spl_load_image_fat(&mmc->block_dev, + err = spl_load_image_fat(mmc_get_blk_desc(mmc), CONFIG_SYS_MMCSD_FS_BOOT_PARTITION, CONFIG_SPL_FS_LOAD_PAYLOAD_NAME); if (!err) |