diff options
| author | Tom Rini <trini@konsulko.com> | 2018-02-10 17:04:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-02-10 17:04:13 -0500 |
| commit | f59ab6c659fc8c3abc3fdd85ce9279f7930256a7 (patch) | |
| tree | b618c5d4b0573783591e61f2e16234c6846f016d /include/pe.h | |
| parent | 1811a928c6c7604d6d05a84b4d552a7c31b4994e (diff) | |
| parent | df9cf561b04dd3fc5a94f7a2c2500948ae8ba56b (diff) | |
Merge tag 'signed-efi-v2018.03' of git://github.com/agraf/u-boot
Patch queue for efi in 2018.03 - 2018-02-10
This time we have a few important bug fixes. Most noticable are:
- Fix OpenBSD loader with CONFIG_BLK=n
- Fix builds on various circumstances
- Add missing stubs so callers don't call NULL
- Bump UEFI revision to 2.7
Diffstat (limited to 'include/pe.h')
| -rw-r--r-- | include/pe.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/pe.h b/include/pe.h index 4ef3e92efaf..c3a19cef765 100644 --- a/include/pe.h +++ b/include/pe.h @@ -11,6 +11,8 @@ #ifndef _PE_H #define _PE_H +#include <asm-generic/pe.h> + typedef struct _IMAGE_DOS_HEADER { uint16_t e_magic; /* 00: MZ Header signature */ uint16_t e_cblp; /* 02: Bytes on last page of file */ @@ -62,12 +64,6 @@ typedef struct _IMAGE_DATA_DIRECTORY { #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 -/* PE32+ Subsystem type for EFI images */ -#define IMAGE_SUBSYSTEM_EFI_APPLICATION 10 -#define IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER 11 -#define IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER 12 -#define IMAGE_SUBSYSTEM_SAL_RUNTIME_DRIVER 13 - typedef struct _IMAGE_OPTIONAL_HEADER64 { uint16_t Magic; /* 0x20b */ uint8_t MajorLinkerVersion; |