Merge git://git.denx.de/u-boot-dm

[oweals/u-boot.git] / common / spl / spl_mmc.c

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 1a10c555f42273b6720cde20a93eb2ffc3a9da81..5676acdde3f282da8062d0c679c02116d590b969 100644 (file)
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -23,8 +23,12 @@ static int mmc_load_legacy(struct mmc *mmc, ulong sector,
 {
        u32 image_size_sectors;
        unsigned long count;
+       int ret;
+
+       ret = spl_parse_image_header(header);
+       if (ret)
+               return ret;
 
-       spl_parse_image_header(header);
        /* convert size to sectors - round up */
        image_size_sectors = (spl_image.size + mmc->read_bl_len - 1) /
                             mmc->read_bl_len;
@@ -83,7 +87,7 @@ static int mmc_load_image_raw_sector(struct mmc *mmc, unsigned long sector)
 end:
        if (ret) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-               puts("spl: mmc block read error\n");
+               puts("mmc_load_image_raw_sector: mmc block read error\n");
 #endif
                return -1;
        }
@@ -186,7 +190,7 @@ static int mmc_load_image_raw_os(struct mmc *mmc)
                (void *) CONFIG_SYS_SPL_ARGS_ADDR);
        if (count == 0) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-               puts("spl: mmc block read error\n");
+               puts("mmc_load_image_raw_os: mmc block read error\n");
 #endif
                return -1;
        }
@@ -296,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");