This converts the spi load method to use spl_load. As a consequence, it
also adds support for LOAD_FIT_FULL.
Signed-off-by: Sean Anderson <sean.ander...@seco.com>
Reviewed-by: Stefan Roese <s...@denx.de>
---
(no changes since v1)
common/spl/spl_spi.c | 53 ++++++--------------------------------------
1 file changed, 7 insertions(+), 46 deletions(-)
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c
index 2aff025f76e..75929710935 100644
--- a/common/spl/spl_spi.c
+++ b/common/spl/spl_spi.c
@@ -95,6 +95,10 @@ static int spl_spi_load_image(struct spl_image_info
*spl_image,
struct legacy_img_hdr *header;
unsigned int sf_bus = spl_spi_boot_bus();
unsigned int sf_cs = spl_spi_boot_cs();
+ struct spl_load_info load = {
+ .bl_len = 1,
+ .read = spl_spi_fit_read,
+ };
/*
* Load U-Boot image from SPI flash into RAM
@@ -109,6 +113,7 @@ static int spl_spi_load_image(struct spl_image_info
*spl_image,
return -ENODEV;
}
+ load.dev = flash;
payload_offs = spl_spi_get_uboot_offs(flash);
header = spl_get_load_buffer(-sizeof(*header), sizeof(*header));
@@ -131,52 +136,8 @@ static int spl_spi_load_image(struct spl_image_info
*spl_image,
return err;
}
- if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL) &&
- image_get_magic(header) == FDT_MAGIC) {
- err = spi_flash_read(flash, payload_offs,
- roundup(fdt_totalsize(header), 4),
- (void *)CONFIG_SYS_LOAD_ADDR);
- if (err)
- return err;
- err = spl_parse_image_header(spl_image, bootdev,
- (struct legacy_img_hdr
*)CONFIG_SYS_LOAD_ADDR);
- } else if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
- image_get_magic(header) == FDT_MAGIC) {
- struct spl_load_info load;
-
- debug("Found FIT\n");
- load.dev = flash;
- load.priv = NULL;
- load.filename = NULL;
- load.bl_len = 1;
- load.read = spl_spi_fit_read;
- err = spl_load_simple_fit(spl_image, &load,
- payload_offs,
- header);
- } else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) {
- struct spl_load_info load;
-
- load.dev = flash;
- load.priv = NULL;
- load.filename = NULL;
- load.bl_len = 1;
- load.read = spl_spi_fit_read;
-
- err = spl_load_imx_container(spl_image, &load,
- payload_offs);
- } else {
- err = spl_parse_image_header(spl_image, bootdev,
header);
- if (err)
- return err;
- err = spi_flash_read(flash, payload_offs +
spl_image->offset,
- spl_image->size,
- (void *)spl_image->load_addr);
- }
- if (IS_ENABLED(CONFIG_SPI_FLASH_SOFT_RESET)) {
- err = spi_nor_remove(flash);
- if (err)
- return err;
- }
+ err = spl_load(spl_image, bootdev, &load, header, 0,
+ payload_offs);
}
return err;
--
2.35.1.1320.gc452695387.dirty
