summaryrefslogtreecommitdiff
path: root/include/spl.h
diff options
context:
space:
mode:
authorRoger Quadros <rogerq@kernel.org>2022-09-29 13:11:28 +0300
committerTom Rini <trini@konsulko.com>2022-10-26 15:20:47 -0400
commit06377c5a1fce4d1e9b7a5dfb62a66c4fe0c076ce (patch)
tree02f9b94fbffbb3cc283ca5eabb93d45bf5b9397b /include/spl.h
parent0abe3323f5062032f8deb71cdc0635b124855d16 (diff)
spl: spl_legacy: Fix NAND boot on OMAP3 BeagleBoard
OMAP3 BeagleBoard NAND boot hangs when spl_load_legacy_img() tries to read the header into 'struct hdr' which is allocated on the stack. As the header has already been read once before by spl_nand.c, we can avoid the extra header allocation and read here by simply passing around the pointer to the header. This fixes NAND boot on OMAP3 BeagleBoard. Signed-off-by: Roger Quadros <rogerq@kernel.org> Reviewed-By: Michael Trimarchi <michael@amarulasolutions.com>
Diffstat (limited to 'include/spl.h')
-rw-r--r--include/spl.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/spl.h b/include/spl.h
index 0fc3686bbc..303a657bf5 100644
--- a/include/spl.h
+++ b/include/spl.h
@@ -353,7 +353,8 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
* spl_load_legacy_img() - Loads a legacy image from a device.
* @spl_image: Image description to set up
* @load: Structure containing the information required to load data.
- * @header: Pointer to image header (including appended image)
+ * @offset: Pointer to image
+ * @hdr: Pointer to image header
*
* Reads an legacy image from the device. Loads u-boot image to
* specified load address.
@@ -361,7 +362,9 @@ int spl_load_simple_fit(struct spl_image_info *spl_image,
*/
int spl_load_legacy_img(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev,
- struct spl_load_info *load, ulong header);
+ struct spl_load_info *load, ulong offset,
+ struct legacy_img_hdr *hdr);
+
/**
* spl_load_imx_container() - Loads a imx container image from a device.