diff mbox

[U-Boot,v4,16/20] SPL: do not use fix value for u-boot size

Message ID 1345852714-13138-17-git-send-email-trini@ti.com
State Superseded
Delegated to: Tom Rini
Headers show

Commit Message

Tom Rini Aug. 24, 2012, 11:58 p.m. UTC
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(-)

Comments

Sughosh Ganu Aug. 27, 2012, 7:18 p.m. UTC | #1
On Fri Aug 24, 2012 at 04:58:30PM -0700, Tom Rini wrote:
> 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(-)
> 
> diff --git a/common/spl/spl.c b/common/spl/spl.c
> index 3f47873..f6b2bb0 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

The u-boot size on hawkboard is a bit more than this. I will send a
patch to update hawkboard's config file. Can you include it in your
patch series.

-sughosh
Tom Rini Aug. 27, 2012, 8:14 p.m. UTC | #2
On 08/27/2012 12:18 PM, Sughosh Ganu wrote:
> On Fri Aug 24, 2012 at 04:58:30PM -0700, Tom Rini wrote:
>> 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(-)
>>
>> diff --git a/common/spl/spl.c b/common/spl/spl.c
>> index 3f47873..f6b2bb0 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
> 
> The u-boot size on hawkboard is a bit more than this. I will send a
> patch to update hawkboard's config file. Can you include it in your
> patch series.

Yes, but do we really need it?  On am1808evm I can just write the
u-boot.ais file which includes u-boot.img and the header is read and
used.  Thanks!
diff mbox

Patch

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 3f47873..f6b2bb0 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;
 
@@ -88,7 +92,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;