Merge branch 'master' of git://git.denx.de/u-boot-spi

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

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index c3931c6c4d7761c598d45312e2b5ffc01a676231..6b3e9e4a17a0e6be63179c9a944fb98313d3d76e 100644 (file)
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -18,43 +18,76 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+static int mmc_load_legacy(struct mmc *mmc, ulong sector,
+                          struct image_header *header)
+{
+       u32 image_size_sectors;
+       unsigned long count;
+       int ret;
+
+       ret = spl_parse_image_header(header);
+       if (ret)
+               return ret;
+
+       /* convert size to sectors - round up */
+       image_size_sectors = (spl_image.size + mmc->read_bl_len - 1) /
+                            mmc->read_bl_len;
+
+       /* Read the header too to avoid extra memcpy */
+       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)
+               return -EIO;
+
+       return 0;
+}
+
+static ulong h_spl_load_read(struct spl_load_info *load, ulong sector,
+                            ulong count, void *buf)
+{
+       struct mmc *mmc = load->dev;
+
+       return blk_dread(mmc_get_blk_desc(mmc), sector, count, buf);
+}
+
 static int mmc_load_image_raw_sector(struct mmc *mmc, unsigned long sector)
 {
        unsigned long count;
-       u32 image_size_sectors;
        struct image_header *header;
+       int ret = 0;
 
        header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
                                         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);
-       debug("read sector %lx, count=%lu\n", sector, count);
-       if (count == 0)
+       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;
                goto end;
-
-       if (image_get_magic(header) != IH_MAGIC) {
-               puts("bad magic\n");
-               return -1;
        }
 
-       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;
-
-       /* 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);
-       debug("read %x sectors to %x\n", image_size_sectors,
-             spl_image.load_addr);
+       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
+           image_get_magic(header) == FDT_MAGIC) {
+               struct spl_load_info load;
+
+               debug("Found FIT\n");
+               load.dev = mmc;
+               load.priv = NULL;
+               load.filename = NULL;
+               load.bl_len = mmc->read_bl_len;
+               load.read = h_spl_load_read;
+               ret = spl_load_simple_fit(&load, sector, header);
+       } else {
+               ret = mmc_load_legacy(mmc, sector, header);
+       }
 
 end:
-       if (count == 0) {
+       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;
        }
@@ -122,7 +155,7 @@ static int mmc_load_image_raw_partition(struct mmc *mmc, int partition)
        disk_partition_t info;
        int err;
 
-       err = get_partition_info(&mmc->block_dev, partition, &info);
+       err = part_get_info(&mmc->block_dev, partition, &info);
        if (err) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
                puts("spl: partition error\n");
@@ -149,20 +182,30 @@ static int mmc_load_image_raw_partition(struct mmc *mmc, int partition)
 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);
        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;
        }
 
-       return mmc_load_image_raw_sector(mmc,
+       ret = mmc_load_image_raw_sector(mmc,
                CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR);
+       if (ret)
+               return ret;
+
+       if (spl_image.os != IH_OS_LINUX) {
+               puts("Expected Linux image is not found. Trying to start U-boot\n");
+               return -ENOENT;
+       }
+
+       return 0;
 }
 #else
 int spl_start_uboot(void)
@@ -182,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)
@@ -243,7 +286,7 @@ int spl_mmc_load_image(u32 boot_device)
                return err;
        }
 
-       boot_mode = spl_boot_mode();
+       boot_mode = spl_boot_mode(boot_device);
        err = -EINVAL;
        switch (boot_mode) {
        case MMCSD_MODE_EMMCBOOT:
@@ -257,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");
@@ -284,7 +327,7 @@ int spl_mmc_load_image(u32 boot_device)
                if (!err)
                        return err;
 #endif
-               break;
+               /* If RAW mode fails, try FS mode. */
        case MMCSD_MODE_FS:
                debug("spl: mmc boot mode: fs\n");