提交 97ca364f 编写于 作者: L Lokesh Vutla 提交者: Tom Rini

spl: Support loading a FIT from FAT FS

Detect a FIT when loading from a FAT File system and handle it using the
new FIT SPL support.
Tested-by: NMichal Simek <michal.simek@xilinx.com>
Reviewed-by: NSimon Glass <sjg@chromium.org>
Reviewed-by: NTom Rini <trini@konsulko.com>
Signed-off-by: NLokesh Vutla <lokeshvutla@ti.com>
上级 eafd5410
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <fat.h> #include <fat.h>
#include <errno.h> #include <errno.h>
#include <image.h> #include <image.h>
#include <libfdt.h>
static int fat_registered; static int fat_registered;
...@@ -39,6 +40,20 @@ static int spl_register_fat_device(struct blk_desc *block_dev, int partition) ...@@ -39,6 +40,20 @@ static int spl_register_fat_device(struct blk_desc *block_dev, int partition)
return err; return err;
} }
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 spl_load_image_fat(struct blk_desc *block_dev,
int partition, int partition,
const char *filename) const char *filename)
...@@ -57,11 +72,24 @@ int spl_load_image_fat(struct blk_desc *block_dev, ...@@ -57,11 +72,24 @@ int spl_load_image_fat(struct blk_desc *block_dev,
if (err <= 0) if (err <= 0)
goto end; goto end;
err = spl_parse_image_header(header); if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
if (err) image_get_magic(header) == FDT_MAGIC) {
goto end; 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;
err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0); 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: end:
#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册