Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5a89fa927cf6c54efe36918a4894ce31274d9ef1

Authored by Ying Zhang
Committed by York Sun
1 parent ee4d65117d
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

SPL: P2020RDB: fix the problem booting from spi flash 

There was no enough stack in SPL, so the buffer needed in SPL is to malloc
from memory pool and to repalce the temporary variable.

Signed-off-by: Ying Zhang <b40530@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>

Showing 2 changed files with 14 additions and 5 deletions Side-by-side Diff

... ... @@ -299,13 +299,16 @@
299 299  
300 300 void env_relocate_spec(void)
301 301 {
302   - char buf[CONFIG_ENV_SIZE];
303 302 int ret;
  303 + char *buf = NULL;
304 304  
  305 + buf = (char *)malloc(CONFIG_ENV_SIZE);
305 306 env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
306 307 CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
307 308 if (!env_flash) {
308 309 set_default_env("!spi_flash_probe() failed");
  310 + if (buf)
  311 + free(buf);
309 312 return;
310 313 }
311 314  
... ... @@ -321,6 +324,8 @@
321 324 gd->env_valid = 1;
322 325 out:
323 326 spi_flash_free(env_flash);
  327 + if (buf)
  328 + free(buf);
324 329 env_flash = NULL;
325 330 }
326 331 #endif
include/configs/p1_p2_rdb_pc.h
Diff comments   View file @ 5a89fa9
... ... @@ -579,11 +579,15 @@
579 579 #define CONFIG_SYS_INIT_L2_ADDR_PHYS CONFIG_SYS_INIT_L2_ADDR
580 580 #define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)
581 581 #define CONFIG_SPL_RELOC_TEXT_BASE 0xf8f81000
582   -#define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 128 * 1024)
583   -#define CONFIG_SPL_RELOC_STACK_SIZE (32 << 10)
584   -#define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 160 * 1024)
585   -#define CONFIG_SPL_RELOC_MALLOC_SIZE (96 << 10)
586 582 #define CONFIG_SPL_GD_ADDR (CONFIG_SYS_INIT_L2_ADDR + 112 * 1024)
  583 +#define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 116 * 1024)
  584 +#define CONFIG_SPL_RELOC_STACK_SIZE (32 << 10)
  585 +#define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 148 * 1024)
  586 +#if defined(CONFIG_P2020RDB)
  587 +#define CONFIG_SPL_RELOC_MALLOC_SIZE (364 << 10)
  588 +#else
  589 +#define CONFIG_SPL_RELOC_MALLOC_SIZE (108 << 10)
  590 +#endif
587 591 #elif defined(CONFIG_NAND)
588 592 #ifdef CONFIG_TPL_BUILD
589 593 #define CONFIG_SYS_INIT_L2_ADDR 0xf8f80000