summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2016-12-01 11:09:01 +0100
committerTom Rini <trini@konsulko.com>2016-12-05 11:04:39 -0500
commit1a92541d9c5341c6cdf6f713b056c30c1e06a325 (patch)
tree426006bb7e2a1497c9641163359a4c6f546fa4e6
parentea43683b1381c9bfa7ad1c3238c4f1f3328882db (diff)
downloadu-boot-imx-1a92541d9c5341c6cdf6f713b056c30c1e06a325.zip
u-boot-imx-1a92541d9c5341c6cdf6f713b056c30c1e06a325.tar.gz
u-boot-imx-1a92541d9c5341c6cdf6f713b056c30c1e06a325.tar.bz2
dm: spl: mmc: Fix EXT SPL support
The patch "dm: spl: mmc: Support CONFIG_BLK in SPL MMC" (sha1: 87bce4e5c0b55452d70830928b2d7b98fa24d4e3) converted FAT part of spl_mmc_do_fs_boot() but forget to update also EXT part by 's/&mmc->block_dev/mmc_get_blk_desc(mmc)/'. This patch is fixing compilation error when CONFIG_SPL_EXT_SUPPORT is enabled. Signed-off-by: Michal Simek <michal.simek@xilinx.com> Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--common/spl/spl_mmc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 58b061f..32d7c2a 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -245,13 +245,13 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc)
#endif
#ifdef CONFIG_SPL_EXT_SUPPORT
if (!spl_start_uboot()) {
- err = spl_load_image_ext_os(spl_image, &mmc->block_dev,
+ err = spl_load_image_ext_os(spl_image, 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_ext(spl_image, &mmc->block_dev,
+ err = spl_load_image_ext(spl_image, mmc_get_blk_desc(mmc),
CONFIG_SYS_MMCSD_FS_BOOT_PARTITION,
CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
if (!err)