leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: set the relocated gd with gd->new_gd

Browse Source 
Simplify the arm relocation behavior and get gd directly form new_gd,
as it is already done in crt0_64.S:

	ldr	x18, [x18, #GD_NEW_GD]		/* x18 <- gd->new_gd */

This patch avoid assumption on new GD location (new GD is below bd -
with #GD_SIZE offset).

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
This commit is contained in:
Patrick Delaunay 2020-03-10 10:15:04 +01:00 committed by Tom Rini
parent 15ac0c7500
commit 6de299230f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/lib/crt0.S
View File

@ -127,8 +127,7 @@ ENTRY(_main)
ldr r0, [r9, #GD_START_ADDR_SP] /* sp = gd->start_addr_sp */ ldr r0, [r9, #GD_START_ADDR_SP] /* sp = gd->start_addr_sp */
bic r0, r0, #7 /* 8-byte alignment for ABI compliance */ bic r0, r0, #7 /* 8-byte alignment for ABI compliance */
mov sp, r0 mov sp, r0
ldr r9, [r9, #GD_BD] /* r9 = gd->bd */ ldr r9, [r9, #GD_NEW_GD] /* r9 <- gd->new_gd */
sub r9, r9, #GD_SIZE /* new GD is below bd */
adr lr, here adr lr, here
ldr r0, [r9, #GD_RELOC_OFF] /* r0 = gd->reloc_off */ ldr r0, [r9, #GD_RELOC_OFF] /* r0 = gd->reloc_off */