diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-10 16:56:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-10 16:56:59 -0400 |
| commit | 59e84da0b88e4465f15d196bba59f22c906fa50d (patch) | |
| tree | ba62f7bab206bd44dfd516c5689b7d87ab2b064f /include/efi.h | |
| parent | 3f2e3c7845df11ca8359a6cc804bfd6eb5ce215b (diff) | |
| parent | f8cd72d1ac6aac8cfa48777b5c0681ee2f9e3671 (diff) | |
Merge tag 'efi-2021-07-rc1' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2021-07-rc1
Bug fixes:
* support EFI, HOST, VIRTIO in fsinfo command
* simplify efi_get_device_path_text()
* add missing EFI_UNACCEPTED_MEMORY_TYPE
* mkeficapsule: improve online help
* avoid several build warnings
Documentation:
* UEFI documentation for initrd loading options
* describe building OP-TEE with for UEFI variables
* mmc man-page
Diffstat (limited to 'include/efi.h')
| -rw-r--r-- | include/efi.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/efi.h b/include/efi.h index 503fbf060b..6417a9b8c5 100644 --- a/include/efi.h +++ b/include/efi.h @@ -180,9 +180,13 @@ enum efi_mem_type { */ EFI_PAL_CODE, /* - * Non-volatile memory. + * Byte addressable non-volatile memory. */ EFI_PERSISTENT_MEMORY_TYPE, + /* + * Unaccepted memory must be accepted by boot target before usage. + */ + EFI_UNACCEPTED_MEMORY_TYPE, EFI_MAX_MEMORY_TYPE, }; @@ -201,6 +205,7 @@ enum efi_mem_type { ((u64)0x0000000000010000ULL) /* higher reliability */ #define EFI_MEMORY_RO ((u64)0x0000000000020000ULL) /* read-only */ #define EFI_MEMORY_SP ((u64)0x0000000000040000ULL) /* specific-purpose memory (SPM) */ +#define EFI_MEMORY_CPU_CRYPTO ((u64)0x0000000000080000ULL) /* cryptographically protectable */ #define EFI_MEMORY_RUNTIME ((u64)0x8000000000000000ULL) /* range requires runtime mapping */ #define EFI_MEM_DESC_VERSION 1 |