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 56be94388149856ebd40f7daf0ad1eb95d238a1e..aa371ab52c5606c7529b0817f6d43cf31dc1d1b0 100644 (file)
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -1,24 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2014
  * Texas Instruments, <www.ti.com>
  *
  * Dan Murphy <dmurphy@ti.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * FAT Image Functions copied from spl_mmc.c
  */
 
 #include <common.h>
+#include <env.h>
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <fat.h>
+#include <errno.h>
 #include <image.h>
+#include <linux/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;
 
@@ -30,7 +31,7 @@ static int spl_register_fat_device(block_dev_desc_t *block_dev, int partition)
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
                printf("%s: fat register err - %d\n", __func__, err);
 #endif
-               hang();
+               return err;
        }
 
        fat_registered = 1;
@@ -38,9 +39,23 @@ 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,
-                                               int partition,
-                                               const char *filename)
+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 spl_image_info *spl_image,
+                      struct blk_desc *block_dev, int partition,
+                      const char *filename)
 {
        int err;
        struct image_header *header;
@@ -49,16 +64,42 @@ int spl_load_image_fat(block_dev_desc_t *block_dev,
        if (err)
                goto end;
 
-       header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
-                                               sizeof(struct image_header));
+       header = spl_get_load_buffer(-sizeof(*header), sizeof(*header));
 
        err = file_fat_read(filename, header, sizeof(struct image_header));
        if (err <= 0)
                goto end;
 
-       spl_parse_image_header(header);
-
-       err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0);
+       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;
+
+               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(spl_image, &load, 0, header);
+       } else {
+               err = spl_parse_image_header(spl_image, header);
+               if (err)
+                       goto end;
+
+               err = file_fat_read(filename,
+                                   (u8 *)(uintptr_t)spl_image->load_addr, 0);
+       }
 
 end:
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
@@ -71,7 +112,8 @@ 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 spl_image_info *spl_image,
+                         struct blk_desc *block_dev, int partition)
 {
        int err;
        __maybe_unused char *file;
@@ -81,7 +123,7 @@ int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition)
                return err;
 
 #if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT)
-       file = getenv("falcon_args_file");
+       file = env_get("falcon_args_file");
        if (file) {
                err = file_fat_read(file, (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
                if (err <= 0) {
@@ -89,9 +131,10 @@ int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition)
                               file, err);
                        goto defaults;
                }
-               file = getenv("falcon_image_file");
+               file = env_get("falcon_image_file");
                if (file) {
-                       err = spl_load_image_fat(block_dev, partition, file);
+                       err = spl_load_image_fat(spl_image, block_dev,
+                                                partition, file);
                        if (err != 0) {
                                puts("spl: falling back to default\n");
                                goto defaults;
@@ -106,18 +149,23 @@ int spl_load_image_fat_os(block_dev_desc_t *block_dev, int partition)
 defaults:
 #endif
 
-       err = file_fat_read(CONFIG_SPL_FAT_LOAD_ARGS_NAME,
+       err = file_fat_read(CONFIG_SPL_FS_LOAD_ARGS_NAME,
                            (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
        if (err <= 0) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
                printf("%s: error reading image %s, err - %d\n",
-                      __func__, CONFIG_SPL_FAT_LOAD_ARGS_NAME, err);
+                      __func__, CONFIG_SPL_FS_LOAD_ARGS_NAME, err);
 #endif
                return -1;
        }
 
-       return spl_load_image_fat(block_dev, partition,
-                       CONFIG_SPL_FAT_LOAD_KERNEL_NAME);
+       return spl_load_image_fat(spl_image, block_dev, partition,
+                       CONFIG_SPL_FS_LOAD_KERNEL_NAME);
+}
+#else
+int spl_load_image_fat_os(struct spl_image_info *spl_image,
+                         struct blk_desc *block_dev, int partition)
+{
+       return -ENOSYS;
 }
-#endif
 #endif