Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 627b73e2a79524836b1e933e37e014210ccb80a4

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 3284c8b8ca
Exists in master and in 49 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

configs: Delete obsolete macro, CONFIG_SYS_GBL_DATA_SIZE 

CONFIG_SYS_GBL_DATA_SIZE is not used any more.
The size of struct "global_data" is automatically calculated
by asm-offsets. (See lib/asm-offsets.c)

GENERATED_GBL_DATA_SIZE should be used instead of
CONFIG_SYS_GBL_DATA_SIZE.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>

Showing 25 changed files with 8 additions and 51 deletions Side-by-side Diff

include/configs/M54418TWR.h
Diff comments   View file @ 627b73e
... ... @@ -268,10 +268,8 @@
268 268 /* End of used area in internal SRAM */
269 269 #define CONFIG_SYS_INIT_RAM_SIZE 0x10000
270 270 #define CONFIG_SYS_INIT_RAM_CTRL 0x221
271   -/* size in bytes reserved for initial data */
272   -#define CONFIG_SYS_GBL_DATA_SIZE 256
273 271 #define CONFIG_SYS_GBL_DATA_OFFSET ((CONFIG_SYS_INIT_RAM_SIZE - \
274   - CONFIG_SYS_GBL_DATA_SIZE) - 32)
  272 + GENERATED_GBL_DATA_SIZE) - 32)
275 273 #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
276 274 #define CONFIG_SYS_SBFHDR_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - 32)
277 275  
include/configs/MERGERBOX.h
Diff comments   View file @ 627b73e
... ... @@ -121,9 +121,8 @@
121 121 #define CONFIG_SYS_INIT_RAM_LOCK 1
122 122 #define CONFIG_SYS_INIT_RAM_ADDR 0xE6000000 /* Initial RAM address */
123 123 #define CONFIG_SYS_INIT_RAM_SIZE 0x1000 /* End of used area in RAM */
124   -#define CONFIG_SYS_GBL_DATA_SIZE 0x100 /* num bytes initial data */
125 124 #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE -\
126   - CONFIG_SYS_GBL_DATA_SIZE)
  125 + GENERATED_GBL_DATA_SIZE)
127 126  
128 127 /*
129 128 * Local Bus Configuration & Clock Setup
include/configs/P1023RDS.h
Diff comments   View file @ 627b73e
... ... @@ -194,9 +194,8 @@
194 194 #define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 /* Initial L1 address */
195 195 #define CONFIG_SYS_INIT_RAM_END 0x00004000 /* End of used area in RAM */
196 196  
197   -#define CONFIG_SYS_GBL_DATA_SIZE 128 /* num bytes initial data */
198 197 #define CONFIG_SYS_GBL_DATA_OFFSET \
199   - (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
  198 + (CONFIG_SYS_INIT_RAM_END - GENERATED_GBL_DATA_SIZE)
200 199 #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
201 200  
202 201 #define CONFIG_SYS_MONITOR_LEN (256 * 1024) /* Reserve 256 kB for Mon */
include/configs/ac14xx.h
Diff comments   View file @ 627b73e
... ... @@ -289,9 +289,8 @@
289 289 #define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_SRAM_BASE
290 290 #define CONFIG_SYS_INIT_RAM_END CONFIG_SYS_SRAM_SIZE
291 291  
292   -#define CONFIG_SYS_GBL_DATA_SIZE 0x100
293 292 #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - \
294   - CONFIG_SYS_GBL_DATA_SIZE)
  293 + GENERATED_GBL_DATA_SIZE)
295 294 #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
296 295  
297 296 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
include/configs/adp-ag101.h
Diff comments   View file @ 627b73e
... ... @@ -139,11 +139,6 @@
139 139 #define CONFIG_SYS_MALLOC_LEN (512 << 10)
140 140  
141 141 /*
142   - * size in bytes reserved for initial data
143   - */
144   -#define CONFIG_SYS_GBL_DATA_SIZE 128
145   -
146   -/*
147 142 * AHB Controller configuration
148 143 */
149 144 #define CONFIG_FTAHBC020S
include/configs/adp-ag101p.h
Diff comments   View file @ 627b73e
... ... @@ -139,11 +139,6 @@
139 139 #define CONFIG_SYS_MALLOC_LEN (512 << 10)
140 140  
141 141 /*
142   - * size in bytes reserved for initial data
143   - */
144   -#define CONFIG_SYS_GBL_DATA_SIZE 128
145   -
146   -/*
147 142 * AHB Controller configuration
148 143 */
149 144 #define CONFIG_FTAHBC020S
include/configs/adp-ag102.h
Diff comments   View file @ 627b73e
... ... @@ -204,11 +204,6 @@
204 204 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024)
205 205  
206 206 /*
207   - * size in bytes reserved for initial data
208   -*/
209   -#define CONFIG_SYS_GBL_DATA_SIZE 128
210   -
211   -/*
212 207 * AHB Controller configuration
213 208 */
214 209 #define CONFIG_FTAHBC020S
include/configs/ap_sh4a_4a.h
Diff comments   View file @ 627b73e
... ... @@ -134,8 +134,6 @@
134 134 #define CONFIG_SYS_MONITOR_LEN (256 * 1024)
135 135 /* Size of DRAM reserved for malloc() use */
136 136 #define CONFIG_SYS_MALLOC_LEN (256 * 1024)
137   -/* size in bytes reserved for initial data */
138   -#define CONFIG_SYS_GBL_DATA_SIZE (256)
139 137 #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
140 138  
141 139 /* ENV setting */
include/configs/armadillo-800eva.h
Diff comments   View file @ 627b73e
... ... @@ -94,7 +94,6 @@
94 94 #define CONFIG_SYS_MONITOR_BASE 0x00000000
95 95 #define CONFIG_SYS_MONITOR_LEN (256 * 1024)
96 96 #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
97   -#define CONFIG_SYS_GBL_DATA_SIZE (256)
98 97 #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
99 98 #define CONFIG_SYS_TEXT_BASE 0xE80C0000
100 99  
include/configs/devkit3250.h
Diff comments   View file @ 627b73e
... ... @@ -29,7 +29,6 @@
29 29 */
30 30 #define CONFIG_NR_DRAM_BANKS 1
31 31 #define CONFIG_SYS_MALLOC_LEN SZ_1M
32   -#define CONFIG_SYS_GBL_DATA_SIZE 128
33 32 #define CONFIG_SYS_SDRAM_BASE EMC_DYCS0_BASE
34 33 #define CONFIG_SYS_SDRAM_SIZE SZ_64M
35 34 #define CONFIG_SYS_TEXT_BASE 0x83FA0000
include/configs/dlvision-10g.h
Diff comments   View file @ 627b73e
... ... @@ -217,9 +217,8 @@
217 217 #define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_OCM_DATA_ADDR /* in SDRAM */
218 218 #define CONFIG_SYS_INIT_RAM_END CONFIG_SYS_OCM_DATA_SIZE /* End of used area */
219 219  
220   -#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size/bytes res'd for init data*/
221 220 #define CONFIG_SYS_GBL_DATA_OFFSET \
222   - (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
  221 + (CONFIG_SYS_INIT_RAM_END - GENERATED_GBL_DATA_SIZE)
223 222 #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
224 223  
225 224 /*
include/configs/ecovec.h
Diff comments   View file @ 627b73e
... ... @@ -158,8 +158,6 @@
158 158 #define CONFIG_SYS_MONITOR_LEN (256 * 1024)
159 159 /* Size of DRAM reserved for malloc() use */
160 160 #define CONFIG_SYS_MALLOC_LEN (256 * 1024)
161   -/* size in bytes reserved for initial data */
162   -#define CONFIG_SYS_GBL_DATA_SIZE (256)
163 161 #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
164 162  
165 163 /* ENV setting */
include/configs/io.h
Diff comments   View file @ 627b73e
... ... @@ -198,9 +198,8 @@
198 198 #define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_OCM_DATA_ADDR /* in SDRAM */
199 199 #define CONFIG_SYS_INIT_RAM_END CONFIG_SYS_OCM_DATA_SIZE /* End of used area */
200 200  
201   -#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size/bytes res'd for init data*/
202 201 #define CONFIG_SYS_GBL_DATA_OFFSET \
203   - (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
  202 + (CONFIG_SYS_INIT_RAM_END - GENERATED_GBL_DATA_SIZE)
204 203 #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
205 204  
206 205 /*
include/configs/iocon.h
Diff comments   View file @ 627b73e
... ... @@ -238,9 +238,8 @@
238 238 #define CONFIG_SYS_INIT_RAM_ADDR CONFIG_SYS_OCM_DATA_ADDR /* in SDRAM */
239 239 #define CONFIG_SYS_INIT_RAM_END CONFIG_SYS_OCM_DATA_SIZE /* End of used area */
240 240  
241   -#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size/bytes res'd for init data*/
242 241 #define CONFIG_SYS_GBL_DATA_OFFSET \
243   - (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
  242 + (CONFIG_SYS_INIT_RAM_END - GENERATED_GBL_DATA_SIZE)
244 243 #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
245 244  
246 245 /*
include/configs/km/km83xx-common.h
Diff comments   View file @ 627b73e
... ... @@ -84,7 +84,6 @@
84 84 #define CONFIG_SYS_INIT_RAM_LOCK
85 85 #define CONFIG_SYS_INIT_RAM_ADDR 0xE6000000 /* Initial RAM address */
86 86 #define CONFIG_SYS_INIT_RAM_SIZE 0x1000 /* End of used area in RAM */
87   -#define CONFIG_SYS_GBL_DATA_SIZE 0x100 /* num bytes initial data */
88 87 #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE - \
89 88 GENERATED_GBL_DATA_SIZE)
90 89  
include/configs/koelsch.h
Diff comments   View file @ 627b73e
... ... @@ -106,7 +106,6 @@
106 106 #define CONFIG_SYS_MONITOR_BASE 0x00000000
107 107 #define CONFIG_SYS_MONITOR_LEN (256 * 1024)
108 108 #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
109   -#define CONFIG_SYS_GBL_DATA_SIZE (256)
110 109 #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
111 110  
112 111 /* FLASH */
include/configs/kzm9g.h
Diff comments   View file @ 627b73e
... ... @@ -88,7 +88,6 @@
88 88  
89 89 #define CONFIG_SYS_MONITOR_BASE (KZM_FLASH_BASE)
90 90 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128 * 1024)
91   -#define CONFIG_SYS_GBL_DATA_SIZE (256)
92 91 #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
93 92  
94 93 #define CONFIG_SYS_TEXT_BASE 0x00000000
include/configs/lager.h
Diff comments   View file @ 627b73e
... ... @@ -109,7 +109,6 @@
109 109 #define CONFIG_SYS_MONITOR_BASE 0x00000000
110 110 #define CONFIG_SYS_MONITOR_LEN (256 * 1024)
111 111 #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
112   -#define CONFIG_SYS_GBL_DATA_SIZE (256)
113 112 #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
114 113  
115 114 #if defined(CONFIG_SYS_USE_BOOT_NORFLASH)
include/configs/mxs.h
Diff comments   View file @ 627b73e
... ... @@ -59,7 +59,6 @@
59 59  
60 60 /* Memory sizes */
61 61 #define CONFIG_SYS_MALLOC_LEN 0x00400000 /* 4 MB for malloc */
62   -#define CONFIG_SYS_GBL_DATA_SIZE 128 /* Initial data */
63 62 #define CONFIG_SYS_MEMTEST_START 0x40000000 /* Memtest start adr */
64 63 #define CONFIG_SYS_MEMTEST_END 0x40400000 /* 4 MB RAM test */
65 64  
include/configs/o2dnt-common.h
Diff comments   View file @ 627b73e
... ... @@ -275,10 +275,8 @@
275 275 #define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_SIZE
276 276 #endif
277 277  
278   -/* size in bytes reserved for initial data */
279   -#define CONFIG_SYS_GBL_DATA_SIZE 128
280 278 #define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_END - \
281   - CONFIG_SYS_GBL_DATA_SIZE)
  279 + GENERATED_GBL_DATA_SIZE)
282 280 #define CONFIG_SYS_INIT_SP_OFFSET CONFIG_SYS_GBL_DATA_OFFSET
283 281  
284 282 #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE
include/configs/r0p7734.h
Diff comments   View file @ 627b73e
... ... @@ -140,8 +140,6 @@
140 140 #define CONFIG_SYS_MONITOR_LEN (256 * 1024)
141 141 /* Size of DRAM reserved for malloc() use */
142 142 #define CONFIG_SYS_MALLOC_LEN (256 * 1024)
143   -/* size in bytes reserved for initial data */
144   -#define CONFIG_SYS_GBL_DATA_SIZE (256)
145 143 #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
146 144  
147 145 /* ENV setting */
include/configs/shmin.h
Diff comments   View file @ 627b73e
... ... @@ -62,7 +62,6 @@
62 62 #define CONFIG_SYS_MONITOR_BASE (SHMIN_FLASH_BASE_1 + CONFIG_ENV_SECT_SIZE)
63 63 #define CONFIG_SYS_MONITOR_LEN (128 * 1024)
64 64 #define CONFIG_SYS_MALLOC_LEN (256 * 1024)
65   -#define CONFIG_SYS_GBL_DATA_SIZE 256
66 65 #define CONFIG_SYS_BOOTMAPSZ (8 * 1024 * 1024)
67 66  
68 67 /* FLASH */
include/configs/snowball.h
Diff comments   View file @ 627b73e
... ... @@ -41,8 +41,6 @@
41 41 #define CONFIG_ENV_SIZE (8*1024)
42 42 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 256*1024)
43 43  
44   -#define CONFIG_SYS_GBL_DATA_SIZE 128 /* for initial data */
45   -
46 44 #define CONFIG_ENV_IS_IN_MMC
47 45 #define CONFIG_CMD_ENV
48 46 #define CONFIG_CMD_SAVEENV
include/configs/u8500_href.h
Diff comments   View file @ 627b73e
... ... @@ -29,7 +29,6 @@
29 29 #define CONFIG_ENV_SIZE (128*1024)
30 30 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 256*1024)
31 31 #endif
32   -#define CONFIG_SYS_GBL_DATA_SIZE 128 /* for initial data */
33 32  
34 33 /*
35 34 * PL011 Configuration
include/configs/vl_ma2sc.h
Diff comments   View file @ 627b73e
... ... @@ -363,7 +363,6 @@
363 363 */
364 364 #define CONFIG_SYS_MALLOC_LEN \
365 365 ROUND(3 * CONFIG_ENV_SIZE + 128 * 1024, 0x1000)
366   -#define CONFIG_SYS_GBL_DATA_SIZE 128 /* 128 bytes for initial data */
367 366  
368 367 #ifndef CONFIG_RAMLOAD
369 368 #define CONFIG_BOOTCOMMAND "run nfsboot"