diff options
author | Kunihiko Hayashi <hayashi.kunihiko@socionext.com> | 2021-06-15 09:33:02 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-06-28 21:47:10 +0300 |
commit | 534f0fbd65203871c2b054096422a5d0f3346cb1 (patch) | |
tree | c74468b587def18bbddfc217b53fa0de1da1b221 /configs/beelink-gtking_defconfig | |
parent | 2bba78076b03e47967180776a8da74a018186480 (diff) | |
download | u-boot-534f0fbd65203871c2b054096422a5d0f3346cb1.tar.xz |
arm64: Fix relocation of env_addr if POSITION_INDEPENDENT=y
If both POSITION_INDEPENDENT and SYS_RELOC_GD_ENV_ADDR are enabled,
wherever original env is placed anywhere, it should be relocated to
the right address.
Relocation offset gd->reloc_off is calculated with SYS_TEXT_BASE in
setup_reloc() and env address gd->env_addr is relocated by the offset in
initr_reloc_global_data().
gd->env_addr
= (orig env) + gd->reloc_off
= (orig env) + (gd->relocaddr - SYS_TEXT_BASE)
However, SYS_TEXT_BASE isn't always runtime base address when
POSITION_INDEPENDENT is enabled. So the relocated env_addr might point to
wrong address. For example, if SYS_TEXT_BASE is zero, gd->env_addr is
out of memory location and memory exception will occur.
There is a difference between linked address such as SYS_TEXT_BASE and
runtime base address. In _main, the difference is calculated as
"run-vs-link" offset. The env_addr should also be added to the offset
to fix the address.
gd->env_addr
= (orig env) + ("run-vs-link" offset) + gd->reloc_off
= (orig env) + (SYS_TEXT_BASE - _start) + (gd->relocaddr - SYS_TEXT_BASE)
= (orig env) + (gd->relocaddr - _start)
Cc: Marek Vasut <marex@denx.de>
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Acked-by: Marek Vasut <marex@denx.de>
Tested-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'configs/beelink-gtking_defconfig')
0 files changed, 0 insertions, 0 deletions