diff options
| author | Alexander Graf <agraf@suse.de> | 2018-06-05 20:20:32 +0300 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2018-06-14 11:52:14 +0300 |
| commit | de452c04c391948dbff68029e900fbb10dd5efb2 (patch) | |
| tree | 9806d73ef898c5ad05b372ecc6fb6efe67b4a5f2 /lib/efi_loader/efi_image_loader.c | |
| parent | acaee30608ce203289a180d664b7f0abb2e64ee7 (diff) | |
| download | u-boot-de452c04c391948dbff68029e900fbb10dd5efb2.tar.xz | |
riscv: Add support for HI20 PE relocations
The PE standard allows for HI20/LOW12 relocations. Within the efi_loader
target we always know that our relocation target is 4k aligned, so we
don't need to worry about the LOW12 part.
This patch adds support for the respective relocations. With this and a
few grub patches I have cooking in parallel I'm able to run grub on RISC-V.
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'lib/efi_loader/efi_image_loader.c')
| -rw-r--r-- | lib/efi_loader/efi_image_loader.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 3cffe9ef46..ecdb77e5b6 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -126,6 +126,20 @@ static efi_status_t efi_loader_relocate(const IMAGE_BASE_RELOCATION *rel, case IMAGE_REL_BASED_DIR64: *x64 += (uint64_t)delta; break; +#ifdef __riscv + case IMAGE_REL_BASED_RISCV_HI20: + *x32 = ((*x32 & 0xfffff000) + (uint32_t)delta) | + (*x32 & 0x00000fff); + break; + case IMAGE_REL_BASED_RISCV_LOW12I: + case IMAGE_REL_BASED_RISCV_LOW12S: + /* We know that we're 4k aligned */ + if (delta & 0xfff) { + printf("Unsupported reloc offset\n"); + return EFI_LOAD_ERROR; + } + break; +#endif default: printf("Unknown Relocation off %x type %x\n", offset, type); |