Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit f80e5359801b5edb705bd86b29bf3d9aff13990a

Authored by Max Filippov
Committed by Tom Rini
1 parent fd60e99f55
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, 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-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_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-n7.1.2_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, v2017.01-smarct3x, v2017.01-smarct3x-emmc

cmd/bdinfo: extract print_bi_flash 

print_bi_flash outputs flashstart, flashsize and flashoffset lines.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

Showing 1 changed file with 27 additions and 27 deletions Side-by-side Diff

... ... @@ -105,6 +105,24 @@
105 105 #endif
106 106 }
107 107  
  108 +static inline void print_bi_flash(const bd_t *bd)
  109 +{
  110 +#if defined(CONFIG_MICROBLAZE) || defined(CONFIG_SH)
  111 + print_num("flash start ", (ulong)bd->bi_flashstart);
  112 + print_num("flash size ", (ulong)bd->bi_flashsize);
  113 + print_num("flash offset ", (ulong)bd->bi_flashoffset);
  114 +
  115 +#elif defined(CONFIG_NIOS2) || defined(CONFIG_OPENRISC)
  116 + print_num("flash start", (ulong)bd->bi_flashstart);
  117 + print_num("flash size", (ulong)bd->bi_flashsize);
  118 + print_num("flash offset", (ulong)bd->bi_flashoffset);
  119 +#else
  120 + print_num("flashstart", (ulong)bd->bi_flashstart);
  121 + print_num("flashsize", (ulong)bd->bi_flashsize);
  122 + print_num("flashoffset", (ulong)bd->bi_flashoffset);
  123 +#endif
  124 +}
  125 +
108 126 #if defined(CONFIG_PPC)
109 127 void __weak board_detail(void)
110 128 {
... ... @@ -119,9 +137,7 @@
119 137 print_num("bd address", (ulong)bd);
120 138 #endif
121 139 print_bi_mem(bd);
122   - print_num("flashstart", bd->bi_flashstart);
123   - print_num("flashsize", bd->bi_flashsize);
124   - print_num("flashoffset", bd->bi_flashoffset);
  140 + print_bi_flash(bd);
125 141 print_num("sramstart", bd->bi_sramstart);
126 142 print_num("sramsize", bd->bi_sramsize);
127 143 #if defined(CONFIG_5xx) || defined(CONFIG_8xx) || \
... ... @@ -195,9 +211,7 @@
195 211 bd_t *bd = gd->bd;
196 212  
197 213 print_bi_dram(bd);
198   - print_num("flash start", (ulong)bd->bi_flashstart);
199   - print_num("flash size", (ulong)bd->bi_flashsize);
200   - print_num("flash offset", (ulong)bd->bi_flashoffset);
  214 + print_bi_flash(bd);
201 215  
202 216 #if defined(CONFIG_SYS_SRAM_BASE)
203 217 print_num ("sram start", (ulong)bd->bi_sramstart);
... ... @@ -221,9 +235,7 @@
221 235 bd_t *bd = gd->bd;
222 236  
223 237 print_bi_dram(bd);
224   - print_num("flash start ", (ulong)bd->bi_flashstart);
225   - print_num("flash size ", (ulong)bd->bi_flashsize);
226   - print_num("flash offset ", (ulong)bd->bi_flashoffset);
  238 + print_bi_flash(bd);
227 239 #if defined(CONFIG_SYS_SRAM_BASE)
228 240 print_num("sram start ", (ulong)bd->bi_sramstart);
229 241 print_num("sram size ", (ulong)bd->bi_sramsize);
... ... @@ -281,9 +293,7 @@
281 293 bd_t *bd = gd->bd;
282 294  
283 295 print_bi_mem(bd);
284   - print_num("flashstart", (ulong)bd->bi_flashstart);
285   - print_num("flashsize", (ulong)bd->bi_flashsize);
286   - print_num("flashoffset", (ulong)bd->bi_flashoffset);
  296 + print_bi_flash(bd);
287 297 #if defined(CONFIG_SYS_INIT_RAM_ADDR)
288 298 print_num("sramstart", (ulong)bd->bi_sramstart);
289 299 print_num("sramsize", (ulong)bd->bi_sramsize);
... ... @@ -335,9 +345,7 @@
335 345  
336 346 print_bi_boot_params(bd);
337 347 print_bi_mem(bd);
338   - print_num("flashstart", (ulong)bd->bi_flashstart);
339   - print_num("flashsize", (ulong)bd->bi_flashsize);
340   - print_num("flashoffset", (ulong)bd->bi_flashoffset);
  348 + print_bi_flash(bd);
341 349  
342 350 print_eth(0);
343 351 printf("ip_addr = %s\n", getenv("ipaddr"));
... ... @@ -354,9 +362,7 @@
354 362  
355 363 print_bi_boot_params(bd);
356 364 print_bi_mem(bd);
357   - print_num("flashstart", (ulong)bd->bi_flashstart);
358   - print_num("flashsize", (ulong)bd->bi_flashsize);
359   - print_num("flashoffset", (ulong)bd->bi_flashoffset);
  365 + print_bi_flash(bd);
360 366  
361 367 print_eth(0);
362 368 printf("ip_addr = %s\n", getenv("ipaddr"));
... ... @@ -375,9 +381,7 @@
375 381  
376 382 print_bi_boot_params(bd);
377 383 print_bi_mem(bd);
378   - print_num("flashstart", (ulong)bd->bi_flashstart);
379   - print_num("flashsize", (ulong)bd->bi_flashsize);
380   - print_num("flashoffset", (ulong)bd->bi_flashoffset);
  384 + print_bi_flash(bd);
381 385  
382 386 print_eth(0);
383 387 printf("ip_addr = %s\n", getenv("ipaddr"));
... ... @@ -444,9 +448,7 @@
444 448 bd_t *bd = gd->bd;
445 449  
446 450 print_bi_mem(bd);
447   - print_num("flash start ", (ulong)bd->bi_flashstart);
448   - print_num("flash size ", (ulong)bd->bi_flashsize);
449   - print_num("flash offset ", (ulong)bd->bi_flashoffset);
  451 + print_bi_flash(bd);
450 452  
451 453 #if defined(CONFIG_CMD_NET)
452 454 print_eth(0);
... ... @@ -531,9 +533,7 @@
531 533 bd_t *bd = gd->bd;
532 534  
533 535 print_bi_mem(bd);
534   - print_num("flash start", (ulong)bd->bi_flashstart);
535   - print_num("flash size", (ulong)bd->bi_flashsize);
536   - print_num("flash offset", (ulong)bd->bi_flashoffset);
  536 + print_bi_flash(bd);
537 537  
538 538 #if defined(CONFIG_CMD_NET)
539 539 print_eth(0);