| Message ID | 1345718776-18113-1-git-send-email-sbabic@denx.de |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
On 08/23/2012 12:46 PM, Stefano Babic wrote: > If an u-boot image is not found, SPL thinks to load a bare > u-boot.bin image with a maximum size of 200KB. > Use CONFIG_SYS_MONITOR_LEN instead. > > Signed-off-by: Stefano Babic <sbabic@denx.de> > CC: Tom Rini <trini@ti.com> > CC: Stefan Roese <stefan.roese@gmail.com> Acked-by: Stefan Roese <sr@denx.de> Thanks, Stefan
On 08/23/2012 03:46 AM, Stefano Babic wrote: > If an u-boot image is not found, SPL thinks to load a bare > u-boot.bin image with a maximum size of 200KB. > Use CONFIG_SYS_MONITOR_LEN instead. > > Signed-off-by: Stefano Babic <sbabic@denx.de> > CC: Tom Rini <trini@ti.com> > CC: Stefan Roese <stefan.roese@gmail.com> Looks good, I'll take this for my v4.
diff --git a/common/spl/spl.c b/common/spl/spl.c index 7d15460..d9e4b62 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -36,6 +36,10 @@ DECLARE_GLOBAL_DATA_PTR; +#ifndef CONFIG_SYS_MONITOR_LEN +#define CONFIG_SYS_MONITOR_LEN (200 * 1024) +#endif + u32* boot_params_ptr = NULL; struct spl_image_info spl_image; @@ -100,7 +104,7 @@ void spl_parse_image_header(const struct image_header *header) debug("mkimage signature not found - ih_magic = %x\n", header->ih_magic); /* Let's assume U-Boot will not be more than 200 KB */ - spl_image.size = 200 * 1024; + spl_image.size = CONFIG_SYS_MONITOR_LEN; spl_image.entry_point = CONFIG_SYS_TEXT_BASE; spl_image.load_addr = CONFIG_SYS_TEXT_BASE; spl_image.os = IH_OS_U_BOOT;
If an u-boot image is not found, SPL thinks to load a bare u-boot.bin image with a maximum size of 200KB. Use CONFIG_SYS_MONITOR_LEN instead. Signed-off-by: Stefano Babic <sbabic@denx.de> CC: Tom Rini <trini@ti.com> CC: Stefan Roese <stefan.roese@gmail.com> --- Changes: - move the #ifdef out of the C code (Stefan Roese) common/spl/spl.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)