diff options
| author |   Palmer Dabbelt <palmerdabbelt@google.com> | 2020-10-02 14:29:51 -0700 |
|---|---|---|
| committer | Palmer Dabbelt <palmerdabbelt@google.com> | 2020-10-02 14:29:51 -0700 |
| commit | 8a3f30c4319dc70547f11c18da2e7b5987543aa1 (patch) | |
| tree | b9a549ff8fdba72fdfdbe909191e99c75b2e2ccb /include/linux | |
| parent | RISC-V: Fix duplicate included thread_info.h (diff) | |
| parent | efi/libstub: arm32: Use low allocation for the uncompressed kernel (diff) | |
| download | wireguard-linux-8a3f30c4319dc70547f11c18da2e7b5987543aa1.tar.xz wireguard-linux-8a3f30c4319dc70547f11c18da2e7b5987543aa1.zip | |
Merge tag 'efi-riscv-shared-for-v5.10' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/efi/efi into for-next
Stable branch for v5.10 shared between the EFI and RISC-V trees
The RISC-V EFI boot and runtime support will be merged for v5.10 via
the RISC-V tree. However, it incorporates some changes that conflict
with other EFI changes that are in flight, so this tag serves as a
shared base that allows those conflicts to be resolved beforehand.
* tag 'efi-riscv-shared-for-v5.10' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/efi/efi:
efi/libstub: arm32: Use low allocation for the uncompressed kernel
efi/libstub: Export efi_low_alloc_above() to other units
efi/libstub: arm32: Base FDT and initrd placement on image address
efi: Rename arm-init to efi-init common for all arch
include: pe.h: Add RISC-V related PE definition
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pe.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/pe.h b/include/linux/pe.h index 8ad71d763a77..daf09ffffe38 100644 --- a/include/linux/pe.h +++ b/include/linux/pe.h @@ -55,6 +55,9 @@ #define IMAGE_FILE_MACHINE_POWERPC 0x01f0 #define IMAGE_FILE_MACHINE_POWERPCFP 0x01f1 #define IMAGE_FILE_MACHINE_R4000 0x0166 +#define IMAGE_FILE_MACHINE_RISCV32 0x5032 +#define IMAGE_FILE_MACHINE_RISCV64 0x5064 +#define IMAGE_FILE_MACHINE_RISCV128 0x5128 #define IMAGE_FILE_MACHINE_SH3 0x01a2 #define IMAGE_FILE_MACHINE_SH3DSP 0x01a3 #define IMAGE_FILE_MACHINE_SH3E 0x01a4 |