Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit da46c77d7dc32d4d1c53e9cf570689b9450ebf66

Authored by Hou Zhiqiang
Committed by Priyanka Jain
1 parent ec9bce0ae4
Exists in smarc_8mq_lf_v2020.04 and in 4 other branches pitx_8mp_lf_v2020.04, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mp_lf_v2020.04

arm64: fsl-layerscape: Assign addr to resv_ram if enabled RESV_RAM config 

The initialization of gd->arch.resv_ram pointer should depend on if the
RESV_RAM config is enabled.

Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@nxp.com>

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

arch/arm/cpu/armv8/fsl-layerscape/cpu.c
Diff comments   View file @ da46c77
... ... @@ -1384,7 +1384,7 @@
1384 1384 if (i > 0)
1385 1385 ret = 0;
1386 1386  
1387   -#if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD)
  1387 +#if defined(CONFIG_RESV_RAM) && !defined(CONFIG_SPL_BUILD)
1388 1388 /* Assign memory for MC */
1389 1389 #ifdef CONFIG_SYS_DDR_BLOCK3_BASE
1390 1390 if (gd->bd->bi_dram[2].size >=
... ... @@ -1407,7 +1407,7 @@
1407 1407 board_reserve_ram_top(gd->bd->bi_dram[0].size);
1408 1408 }
1409 1409 }
1410   -#endif /* CONFIG_FSL_MC_ENET */
  1410 +#endif /* CONFIG_RESV_RAM */
1411 1411  
1412 1412 return ret;
1413 1413 }
... ... @@ -1470,7 +1470,7 @@
1470 1470 }
1471 1471 #endif /* CONFIG_SYS_MEM_RESERVE_SECURE */
1472 1472  
1473   -#if defined(CONFIG_FSL_MC_ENET) && !defined(CONFIG_SPL_BUILD)
  1473 +#if defined(CONFIG_RESV_RAM) && !defined(CONFIG_SPL_BUILD)
1474 1474 /* Assign memory for MC */
1475 1475 #ifdef CONFIG_SYS_DDR_BLOCK3_BASE
1476 1476 if (gd->bd->bi_dram[2].size >=
... ... @@ -1493,7 +1493,7 @@
1493 1493 board_reserve_ram_top(gd->bd->bi_dram[0].size);
1494 1494 }
1495 1495 }
1496   -#endif /* CONFIG_FSL_MC_ENET */
  1496 +#endif /* CONFIG_RESV_RAM */
1497 1497  
1498 1498 #ifdef CONFIG_SYS_DP_DDR_BASE_PHY
1499 1499 #ifdef CONFIG_SYS_DDR_BLOCK3_BASE