spl: fat: Support full fitImage handling
authorMarek Vasut <marex@denx.de>
Thu, 31 May 2018 15:59:19 +0000 (17:59 +0200)
committerTom Rini <trini@konsulko.com>
Tue, 10 Jul 2018 20:55:56 +0000 (16:55 -0400)
Handle the case where the full fitImage support is enabled. In this
case, the whole fitImage must be loaded up front as some parts of the
fitImage code require memory-mapped access to the entire fitImage.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Pantelis Antoniou <pantelis.antoniou@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
common/spl/spl_fat.c

index 87dd5532103a455a7614c6fc305b89096dfb3042..0403016bb433c7bdb2299bdcc215204c6cb6bcec 100644 (file)
@@ -70,7 +70,18 @@ int spl_load_image_fat(struct spl_image_info *spl_image,
        if (err <= 0)
                goto end;
 
-       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
+       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL) &&
+           image_get_magic(header) == FDT_MAGIC) {
+               err = file_fat_read(filename, (void *)CONFIG_SYS_LOAD_ADDR, 0);
+               if (err <= 0)
+                       goto end;
+               err = spl_parse_image_header(spl_image,
+                               (struct image_header *)CONFIG_SYS_LOAD_ADDR);
+               if (err == -EAGAIN)
+                       return err;
+               if (err == 0)
+                       err = 1;
+       } else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
            image_get_magic(header) == FDT_MAGIC) {
                struct spl_load_info load;