Patchwork [U-Boot,v6,17/29] SPL: do not use fix value for u-boot size

login
register
mail settings
Submitter Tom Rini
Date Aug. 31, 2012, 6:03 p.m.
Message ID <1346436196-27742-18-git-send-email-trini@ti.com>
Download mbox | patch
Permalink /patch/181019/
State Superseded
Delegated to: Tom Rini
Headers show

Comments

Tom Rini - Aug. 31, 2012, 6:03 p.m.
From: Stefano Babic <sbabic@denx.de>

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: Stefan Roese <stefan.roese@gmail.com>
Signed-off-by: Stefano Babic <sbabic@denx.de>
Signed-off-by: Tom Rini <trini@ti.com>
---
Changes in v4:
- Add Stefano's patch for CONFIG_SYS_MONITOR_LEN

 common/spl/spl.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Patch

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 3f41014..70c374a 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -35,6 +35,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;
 
@@ -86,7 +90,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;