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

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

diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index 350f7d9fd684f610c223f1dc8a58658b43b7f7eb..db676186d354b7b07c1a96920f5ecd582f3adba3 100644 (file)
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -13,12 +13,14 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <fat.h>
+#include <errno.h>
 #include <image.h>
+#include <libfdt.h>
 
 static int fat_registered;
 
 #ifdef CONFIG_SPL_FAT_SUPPORT
-static int spl_register_fat_device(block_dev_desc_t *block_dev, int partition)
+static int spl_register_fat_device(struct blk_desc *block_dev, int partition)
 {
        int err = 0;
 
@@ -38,7 +40,21 @@ static int spl_register_fat_device(block_dev_desc_t *block_dev, int partition)
        return err;
 }
 
-int spl_load_image_fat(block_dev_desc_t *block_dev,
+static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
+                         ulong size, void *buf)
+{
+       loff_t actread;
+       int ret;
+       char *filename = (char *)load->filename;
+
+       ret = fat_read_file(filename, buf, file_offset, size, &actread);
+       if (ret)
+               return ret;
+
+       return actread;
+}
+
+int spl_load_image_fat(struct blk_desc *block_dev,
                                                int partition,
                                                const char *filename)
 {
@@ -56,9 +72,24 @@ int spl_load_image_fat(block_dev_desc_t *block_dev,
        if (err <= 0)
                goto end;
 
-       spl_parse_image_header(header);
+       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
+           image_get_magic(header) == FDT_MAGIC) {
+               struct spl_load_info load;
 
-       err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0);
+               debug("Found FIT\n");
+               load.read = spl_fit_read;
+               load.bl_len = 1;
+               load.filename = (void *)filename;
+               load.priv = NULL;
+
+               return spl_load_simple_fit(&load, 0, header);
+       } else {
+               err = spl_parse_image_header(header);
+               if (err)
+                       goto end;
+
+               err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0);
+       }
 
 end:
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
@@ -71,7 +102,7 @@ end:
 }
 
 #ifdef CONFIG_SPL_OS_BOOT
-int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition)
+int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
 {
        int err;
        __maybe_unused char *file;
@@ -119,5 +150,10 @@ defaults:
        return spl_load_image_fat(block_dev, partition,
                        CONFIG_SPL_FS_LOAD_KERNEL_NAME);
 }
+#else
+int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
+{
+       return -ENOSYS;
+}
 #endif
 #endif