Re: [PATCH v8 09/15] common: spl: fit_ram: allow to use image pre load

[Tom Rini]

On Mon, Mar 28, 2022 at 10:57:01PM +0200, Philippe Reynes wrote:

> Add the support of image pre load in spl or tpl
> when loading an image from ram.
> 
> Reviewed-by: Simon Glass 
> Signed-off-by: Philippe Reynes 

Applied to u-boot/next, thanks!

-- 
Tom


signature.asc
Description: PGP signature

[PATCH v8 09/15] common: spl: fit_ram: allow to use image pre load

[Philippe Reynes]

Add the support of image pre load in spl or tpl
when loading an image from ram.

Reviewed-by: Simon Glass 
Signed-off-by: Philippe Reynes 
---
 common/spl/spl_ram.c | 21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/common/spl/spl_ram.c b/common/spl/spl_ram.c
index 3f7f7accc1..8296459257 100644
--- a/common/spl/spl_ram.c
+++ b/common/spl/spl_ram.c
@@ -24,9 +24,17 @@
 static ulong spl_ram_load_read(struct spl_load_info *load, ulong sector,
   ulong count, void *buf)
 {
+   ulong addr;
+
debug("%s: sector %lx, count %lx, buf %lx\n",
  __func__, sector, count, (ulong)buf);
-   memcpy(buf, (void *)(CONFIG_SPL_LOAD_FIT_ADDRESS + sector), count);
+
+   addr = (ulong)CONFIG_SPL_LOAD_FIT_ADDRESS + sector;
+   if (CONFIG_IS_ENABLED(IMAGE_PRE_LOAD))
+   addr += image_load_offset;
+
+   memcpy(buf, (void *)addr, count);
+
return count;
 }
 
@@ -37,6 +45,17 @@ static int spl_ram_load_image(struct spl_image_info 
*spl_image,
 
header = (struct image_header *)CONFIG_SPL_LOAD_FIT_ADDRESS;
 
+   if (CONFIG_IS_ENABLED(IMAGE_PRE_LOAD)) {
+   unsigned long addr = (unsigned long)header;
+   int ret = image_pre_load(addr);
+
+   if (ret)
+   return ret;
+
+   addr += image_load_offset;
+   header = (struct image_header *)addr;
+   }
+
 #if CONFIG_IS_ENABLED(DFU)
if (bootdev->boot_device == BOOT_DEVICE_DFU)
spl_dfu_cmd(0, "dfu_alt_info_ram", "ram", "0");
-- 
2.25.1