diff options
| author | Tom Rini <trini@konsulko.com> | 2016-11-17 16:46:45 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-17 16:46:45 (GMT) |
| commit | 9e40ea04e9f1a70a184504c9e2beb051eb2d9335 (patch) | |
| tree | dddf5ab6a2ce464955233c7ae542ec102bb12050 /arch/arm/lib/relocate_64.S | |
| parent | 688d1be5ba63be281c2894e74b27209133598e2e (diff) | |
| parent | b99ebaf9f01ebe864061818e00beb70cb1ddc635 (diff) | |
| download | u-boot-9e40ea04e9f1a70a184504c9e2beb051eb2d9335.tar.xz | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2016-11-17
Highlights this time around:
- x86 efi_loader support
- hello world efi test case
- network device name is now representative
- terminal output reports modes correctly
- fix psci reset for ls1043/ls1046
- fix efi_add_runtime_mmio definition for x86
- efi_loader support for ls2080
Diffstat (limited to 'arch/arm/lib/relocate_64.S')
| -rw-r--r-- | arch/arm/lib/relocate_64.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/lib/relocate_64.S b/arch/arm/lib/relocate_64.S index 5c51cae..242e56e 100644 --- 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 <elf.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 - cmp x1, #1027 /* relative fixup? */ + cmp x1, #R_AARCH64_RELATIVE bne fixnext /* relative fix: store addend plus offset at dest location */ |