]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
dm: spl: mmc: Fix EXT SPL support
authorMichal Simek <michal.simek@xilinx.com>
Thu, 1 Dec 2016 10:09:01 +0000 (11:09 +0100)
committerTom Rini <trini@konsulko.com>
Mon, 5 Dec 2016 16:04:39 +0000 (11:04 -0500)
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>
common/spl/spl_mmc.c

index 58b061f76baadd720f67f444c1e5812996502813..32d7c2a84b44399e5584045362484a69a1b343b5 100644 (file)
@@ -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)