u-boot 2011.12: modify multi-machine version for the new .inc file
[glsdk/meta-ti-glsdk.git] / recipes-bsp / u-boot / u-boot-2012.04.01 / 0001-ARM-omap3-Set-SPL-stack-size-to-8KB-image-to-54KB.patch
1 From e0820ccc38315d88192c19e98ea9b59d3ec7d4c8 Mon Sep 17 00:00:00 2001
2 From: Tom Rini <trini@ti.com>
3 Date: Tue, 8 May 2012 07:29:31 +0000
4 Subject: [PATCH] ARM: omap3: Set SPL stack size to 8KB, image to 54KB.
6 With older toolchains it is possible to not fit entirely into the 45KB
7 that we had assigned to SPL.  Adjust to allow for 8KB of stack (which
8 should be more than required) and 54KB of text/data.
10 Cc: Vaibhav Hiremath <hvaibhav@ti.com>
11 Cc: Nagendra T S <nagendra@mistralsolutions.com>
12 Cc: Thomas Weber <weber@corscience.de>
13 Cc: Ilya Yanok <yanok@emcraft.com>
14 Cc: Steve Sakoman <sakoman@gmail.com>
15 Cc: Stefano Babic <sbabic@denx.de>
16 Signed-off-by: Tom Rini <trini@ti.com>
17 Acked-by: Stefano Babic <sbabic@denx.de>
18 Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
19 ---
20  doc/SPL/README.omap3               |    4 ++--
21  include/configs/am3517_crane.h     |    2 +-
22  include/configs/am3517_evm.h       |    2 +-
23  include/configs/devkit8000.h       |    2 +-
24  include/configs/mcx.h              |    2 +-
25  include/configs/omap3_beagle.h     |    2 +-
26  include/configs/omap3_evm_common.h |    2 +-
27  include/configs/omap3_overo.h      |    2 +-
28  include/configs/tam3517-common.h   |    2 +-
29  include/configs/tricorder.h        |    2 +-
30  10 files changed, 11 insertions(+), 11 deletions(-)
32 diff --git a/doc/SPL/README.omap3 b/doc/SPL/README.omap3
33 index cc5d5c0..a543e65 100644
34 --- a/doc/SPL/README.omap3
35 +++ b/doc/SPL/README.omap3
36 @@ -34,14 +34,14 @@ DDR1: 0x80000000 - 0xBFFFFFFF
37  
38  Option 1 (SPL only):
39  0x40200800 - 0x4020BBFF: Area for SPL text, data and rodata
40 -0x4020BC00 - 0x4020FFFC: Area for the SPL stack.
41 +0x4020E000 - 0x4020FFFC: Area for the SPL stack.
42  0x80000000 - 0x8007FFFF: Area for the SPL BSS.
43  0x80100000: CONFIG_SYS_TEXT_BASE of U-Boot
44  0x80208000 - 0x80307FFF: malloc() pool available to SPL.
45  
46  Option 2 (SPL or X-Loader):
47  0x40200800 - 0x4020BBFF: Area for SPL text, data and rodata
48 -0x4020BC00 - 0x4020FFFC: Area for the SPL stack.
49 +0x4020E000 - 0x4020FFFC: Area for the SPL stack.
50  0x80008000: CONFIG_SYS_TEXT_BASE of U-Boot
51  0x87000000 - 0x8707FFFF: Area for the SPL BSS.
52  0x87080000 - 0x870FFFFF: malloc() pool available to SPL.
53 diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
54 index 71321f3..1233985 100644
55 --- a/include/configs/am3517_crane.h
56 +++ b/include/configs/am3517_crane.h
57 @@ -325,7 +325,7 @@
58  #define CONFIG_SPL
59  #define CONFIG_SPL_NAND_SIMPLE
60  #define CONFIG_SPL_TEXT_BASE           0x40200800
61 -#define CONFIG_SPL_MAX_SIZE            (45 * 1024)
62 +#define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
63  #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
64  
65  #define CONFIG_SPL_BSS_START_ADDR      0x80000000
66 diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
67 index bbd19de..ff8d1b0 100644
68 --- a/include/configs/am3517_evm.h
69 +++ b/include/configs/am3517_evm.h
70 @@ -324,7 +324,7 @@
71  #define CONFIG_SPL
72  #define CONFIG_SPL_NAND_SIMPLE
73  #define CONFIG_SPL_TEXT_BASE           0x40200800
74 -#define CONFIG_SPL_MAX_SIZE            (45 * 1024)
75 +#define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
76  #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
77  
78  #define CONFIG_SPL_BSS_START_ADDR      0x80000000
79 diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
80 index eb7c376..248a5b2 100644
81 --- a/include/configs/devkit8000.h
82 +++ b/include/configs/devkit8000.h
83 @@ -324,7 +324,7 @@
84  #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
85  
86  #define CONFIG_SPL_TEXT_BASE           0x40200000 /*CONFIG_SYS_SRAM_START*/
87 -#define CONFIG_SPL_MAX_SIZE            0xB400  /* 45 K */
88 +#define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
89  #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
90  
91  #define CONFIG_SPL_BSS_START_ADDR       0x80000500 /* leave space for bootargs*/
92 diff --git a/include/configs/mcx.h b/include/configs/mcx.h
93 index e190e3e..f6a83a8 100644
94 --- a/include/configs/mcx.h
95 +++ b/include/configs/mcx.h
96 @@ -325,7 +325,7 @@
97  #define CONFIG_SPL_LDSCRIPT            "$(CPUDIR)/omap-common/u-boot-spl.lds"
98  
99  #define CONFIG_SPL_TEXT_BASE           0x40200000 /*CONFIG_SYS_SRAM_START*/
100 -#define CONFIG_SPL_MAX_SIZE            (45 << 10)
101 +#define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
102  #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
103  
104  /* move malloc and bss high to prevent clashing with the main image */
105 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
106 index ddeb414..6bdc2c3 100644
107 --- a/include/configs/omap3_beagle.h
108 +++ b/include/configs/omap3_beagle.h
109 @@ -399,7 +399,7 @@
110  #define CONFIG_SPL
111  #define CONFIG_SPL_NAND_SIMPLE
112  #define CONFIG_SPL_TEXT_BASE           0x40200800
113 -#define CONFIG_SPL_MAX_SIZE            (45 * 1024)
114 +#define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
115  #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
116  
117  #define CONFIG_SPL_BSS_START_ADDR      0x80000000
118 diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
119 index 4910dda..47ebbef 100644
120 --- a/include/configs/omap3_evm_common.h
121 +++ b/include/configs/omap3_evm_common.h
122 @@ -282,7 +282,7 @@
123  /* Defines for SPL */
124  #define CONFIG_SPL
125  #define CONFIG_SPL_TEXT_BASE           0x40200800
126 -#define CONFIG_SPL_MAX_SIZE            (45 * 1024)     /* 45 KB */
127 +#define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
128  #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
129  
130  #define CONFIG_SPL_BSS_START_ADDR      0x80000000
131 diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
132 index 64adc74..b0d144f 100644
133 --- a/include/configs/omap3_overo.h
134 +++ b/include/configs/omap3_overo.h
135 @@ -303,7 +303,7 @@
136  #define CONFIG_SPL
137  #define CONFIG_SPL_NAND_SIMPLE
138  #define CONFIG_SPL_TEXT_BASE           0x40200800
139 -#define CONFIG_SPL_MAX_SIZE            (45 * 1024)
140 +#define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
141  #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
142  
143  /* move malloc and bss high to prevent clashing with the main image */
144 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
145 index 37eb87b..3fc2c44 100644
146 --- a/include/configs/tam3517-common.h
147 +++ b/include/configs/tam3517-common.h
148 @@ -257,7 +257,7 @@
149  #define CONFIG_SPL_LDSCRIPT            "$(CPUDIR)/omap-common/u-boot-spl.lds"
150  
151  #define CONFIG_SPL_TEXT_BASE           0x40200000 /*CONFIG_SYS_SRAM_START*/
152 -#define CONFIG_SPL_MAX_SIZE            (45 << 10)      /* 45 K */
153 +#define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
154  #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
155  
156  #define CONFIG_SYS_SPL_MALLOC_START    0x8f000000
157 diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
158 index 801a24f..ab911aa 100644
159 --- a/include/configs/tricorder.h
160 +++ b/include/configs/tricorder.h
161 @@ -293,7 +293,7 @@
162  #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
163  
164  #define CONFIG_SPL_TEXT_BASE           0x40200000 /*CONFIG_SYS_SRAM_START*/
165 -#define CONFIG_SPL_MAX_SIZE            0xB400  /* 45 K */
166 +#define CONFIG_SPL_MAX_SIZE            (54 * 1024)     /* 8 KB for stack */
167  #define CONFIG_SPL_STACK               LOW_LEVEL_SRAM_STACK
168  
169  #define CONFIG_SPL_BSS_START_ADDR      0x80000000 /*CONFIG_SYS_SDRAM_BASE*/
170 -- 
171 1.7.0.4