mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2018-06-14 A few minor fixes for the release: - Compile fixes - HI20 relocations for RISC-V - Fix bootefi without load path - Fix Runtime Services with certain compilers
This commit is contained in:
@@ -89,12 +89,11 @@ typedef u64 efi_virtual_addr_t;
|
||||
typedef void *efi_handle_t;
|
||||
|
||||
#define EFI_GUID(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \
|
||||
((efi_guid_t) \
|
||||
{{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, \
|
||||
((a) >> 24) & 0xff, \
|
||||
(b) & 0xff, ((b) >> 8) & 0xff, \
|
||||
(c) & 0xff, ((c) >> 8) & 0xff, \
|
||||
(d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) } })
|
||||
(d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) } }
|
||||
|
||||
/* Generic EFI table header */
|
||||
struct efi_table_hdr {
|
||||
|
||||
@@ -201,10 +201,13 @@ typedef struct _IMAGE_RELOCATION
|
||||
#define IMAGE_REL_BASED_MIPS_JMPADDR 5
|
||||
#define IMAGE_REL_BASED_ARM_MOV32A 5 /* yes, 5 too */
|
||||
#define IMAGE_REL_BASED_ARM_MOV32 5 /* yes, 5 too */
|
||||
#define IMAGE_REL_BASED_RISCV_HI20 5 /* yes, 5 too */
|
||||
#define IMAGE_REL_BASED_SECTION 6
|
||||
#define IMAGE_REL_BASED_REL 7
|
||||
#define IMAGE_REL_BASED_ARM_MOV32T 7 /* yes, 7 too */
|
||||
#define IMAGE_REL_BASED_THUMB_MOV32 7 /* yes, 7 too */
|
||||
#define IMAGE_REL_BASED_RISCV_LOW12I 7 /* yes, 7 too */
|
||||
#define IMAGE_REL_BASED_RISCV_LOW12S 8
|
||||
#define IMAGE_REL_BASED_MIPS_JMPADDR16 9
|
||||
#define IMAGE_REL_BASED_IA64_IMM64 9 /* yes, 9 too */
|
||||
#define IMAGE_REL_BASED_DIR64 10
|
||||
|
||||
Reference in New Issue
Block a user