|
@@ -73,7 +73,12 @@ ENTRY(_main)
|
|
|
#elif defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_STACK)
|
|
|
ldr x0, =(CONFIG_SPL_STACK)
|
|
|
#elif defined(CONFIG_INIT_SP_RELATIVE)
|
|
|
+#if CONFIG_POSITION_INDEPENDENT
|
|
|
+ adrp x0, __bss_start /* x0 <- Runtime &__bss_start */
|
|
|
+ add x0, x0, #:lo12:__bss_start
|
|
|
+#else
|
|
|
adr x0, __bss_start
|
|
|
+#endif
|
|
|
add x0, x0, #CONFIG_SYS_INIT_SP_BSS_OFFSET
|
|
|
#else
|
|
|
ldr x0, =(CONFIG_SYS_INIT_SP_ADDR)
|
|
@@ -102,7 +107,8 @@ ENTRY(_main)
|
|
|
adr lr, relocation_return
|
|
|
#if CONFIG_POSITION_INDEPENDENT
|
|
|
/* Add in link-vs-runtime offset */
|
|
|
- adr x0, _start /* x0 <- Runtime value of _start */
|
|
|
+ adrp x0, _start /* x0 <- Runtime value of _start */
|
|
|
+ add x0, x0, #:lo12:_start
|
|
|
ldr x9, _TEXT_BASE /* x9 <- Linked value of _start */
|
|
|
sub x9, x9, x0 /* x9 <- Run-vs-link offset */
|
|
|
add lr, lr, x9
|