Patchwork [U-Boot,1/2,v2] mpc5200: a3m071/a4m2k: Fix problem with increased global_data struct

login
register
mail settings
Submitter Stefan Roese
Date April 26, 2013, 9:10 a.m.
Message ID <1366967402-8804-1-git-send-email-sr@denx.de>
Download mbox | patch
Permalink /patch/239770/
State Accepted
Delegated to: Wolfgang Denk
Headers show

Comments

Stefan Roese - April 26, 2013, 9:10 a.m.
The v2013.04 release has this patch set included:

5cb48582 "Add architecture-specific global data"

With this, the global_data struct is now common and new variables
have been added. Resulting in a bigger struct. Unfortunately the
currently allocated 128 bytes are just a bit too small for this
new struct.

This patch now uses the automatically generated struct size instead to
not run into this problem again.

Please note that this problem might hit some other platforms which
currently reserve a tight space of 128 bytes for the global_data
struct!

Signed-off-by: Stefan Roese <sr@denx.de>
---
v2:
- Use automatically generated struct size instead instead of a fixed
  value

 include/configs/a3m071.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Wolfgang Denk - May 2, 2013, 6:45 p.m.
Dear Stefan Roese,

In message <1366967402-8804-1-git-send-email-sr@denx.de> you wrote:
> The v2013.04 release has this patch set included:
> 
> 5cb48582 "Add architecture-specific global data"
> 
> With this, the global_data struct is now common and new variables
> have been added. Resulting in a bigger struct. Unfortunately the
> currently allocated 128 bytes are just a bit too small for this
> new struct.
> 
> This patch now uses the automatically generated struct size instead to
> not run into this problem again.
> 
> Please note that this problem might hit some other platforms which
> currently reserve a tight space of 128 bytes for the global_data
> struct!
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> ---
> v2:
> - Use automatically generated struct size instead instead of a fixed
>   value
> 
>  include/configs/a3m071.h | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/include/configs/a3m071.h b/include/configs/a3m071.h
index 13f3226..bcf3853 100644
--- a/include/configs/a3m071.h
+++ b/include/configs/a3m071.h
@@ -121,10 +121,8 @@ 
 #define CONFIG_SYS_INIT_RAM_ADDR	MPC5XXX_SRAM
 #define CONFIG_SYS_INIT_RAM_END		MPC5XXX_SRAM_SIZE
 
-
-#define CONFIG_SYS_GBL_DATA_SIZE	128
 #define CONFIG_SYS_GBL_DATA_OFFSET	(CONFIG_SYS_INIT_RAM_END - \
-					 CONFIG_SYS_GBL_DATA_SIZE)
+					 GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET	CONFIG_SYS_GBL_DATA_OFFSET
 
 #define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_TEXT_BASE