Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 01a835998935b78c31e80227358ac11212d60878

Authored by zijun_hu
Committed by Tom Rini
1 parent 0d3aaa35b8
Exists in smarc_8mq_lf_v2020.04 and in 17 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_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.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

ARMv8: get new GD address from gd->new_gd directly 

the new GD address is calculated via board data BD currently
it require the new GD area locates below BD tightly, so a strict
constraint is imposed on memory layout which maybe make special
platform unpleasant.

fix it by getting new GD address from gd->new_gd directly.

Signed-off-by: zijun_hu <zijun_hu@htc.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

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

arch/arm/lib/crt0_64.S
Diff comments   View file @ 01a8359
... ... @@ -95,8 +95,7 @@
95 95 */
96 96 ldr x0, [x18, #GD_START_ADDR_SP] /* x0 <- gd->start_addr_sp */
97 97 bic sp, x0, #0xf /* 16-byte alignment for ABI compliance */
98   - ldr x18, [x18, #GD_BD] /* x18 <- gd->bd */
99   - sub x18, x18, #GD_SIZE /* new GD is below bd */
  98 + ldr x18, [x18, #GD_NEW_GD] /* x18 <- gd->new_gd */
100 99  
101 100 adr lr, relocation_return
102 101 ldr x9, [x18, #GD_RELOC_OFF] /* x9 <- gd->reloc_off */
... ... @@ -38,6 +38,8 @@
38 38  
39 39 DEFINE(GD_START_ADDR_SP, offsetof(struct global_data, start_addr_sp));
40 40  
  41 + DEFINE(GD_NEW_GD, offsetof(struct global_data, new_gd));
  42 +
41 43 return 0;
42 44 }