projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://www.denx.de/git/u-boot-dm
[oweals/u-boot.git]
/
arch
/
arm
/
lib
/
relocate_64.S
diff --git
a/arch/arm/lib/relocate_64.S
b/arch/arm/lib/relocate_64.S
index 5c51cae8ab0b126fb8c391919a51e880e031e08e..242e56e960848136fb2c61bb2eea12fd249f1d77 100644
(file)
--- a/
arch/arm/lib/relocate_64.S
+++ b/
arch/arm/lib/relocate_64.S
@@
-10,6
+10,7
@@
#include <asm-offsets.h>
#include <config.h>
#include <asm-offsets.h>
#include <config.h>
+#include <elf.h>
#include <linux/linkage.h>
#include <asm/macro.h>
#include <linux/linkage.h>
#include <asm/macro.h>
@@
-47,7
+48,7
@@
fixloop:
ldp x0, x1, [x2], #16 /* (x0,x1) <- (SRC location, fixup) */
ldr x4, [x2], #8 /* x4 <- addend */
and x1, x1, #0xffffffff
ldp x0, x1, [x2], #16 /* (x0,x1) <- (SRC location, fixup) */
ldr x4, [x2], #8 /* x4 <- addend */
and x1, x1, #0xffffffff
- cmp x1, #
1027 /* relative fixup? */
+ cmp x1, #
R_AARCH64_RELATIVE
bne fixnext
/* relative fix: store addend plus offset at dest location */
bne fixnext
/* relative fix: store addend plus offset at dest location */