mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
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
This commit is contained in:
@@ -13,7 +13,7 @@
|
||||
|
||||
#define MAX_UTF8_PER_UTF16 3
|
||||
|
||||
/**
|
||||
/*
|
||||
* codepage_437 - Unicode to codepage 437 translation table
|
||||
*/
|
||||
extern const u16 codepage_437[128];
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -53,21 +53,25 @@
|
||||
*/
|
||||
enum efi_test_phase {
|
||||
/**
|
||||
* @EFI_EXECUTE_BEFORE_BOOTTIME_EXIT: - execute before ExitBootServices
|
||||
* @EFI_EXECUTE_BEFORE_BOOTTIME_EXIT:
|
||||
*
|
||||
* Setup, execute, and teardown are executed before ExitBootServices().
|
||||
*/
|
||||
EFI_EXECUTE_BEFORE_BOOTTIME_EXIT = 1,
|
||||
/**
|
||||
* @EFI_SETUP_BEFORE_BOOTTIME_EXIT: - setup before ExitBootServices
|
||||
* @EFI_SETUP_BEFORE_BOOTTIME_EXIT:
|
||||
*
|
||||
* Setup is executed before ExitBootServices() while execute, and
|
||||
* teardown are executed after ExitBootServices().
|
||||
*/
|
||||
EFI_SETUP_BEFORE_BOOTTIME_EXIT,
|
||||
/**
|
||||
* @EFI_SETTING_VIRTUAL_ADDRESS_MAP - calls SetVirtualAddressMap()
|
||||
* Execute calls SetVirtualAddressMap().
|
||||
* @EFI_SETTING_VIRTUAL_ADDRESS_MAP:
|
||||
*
|
||||
* Execute calls SetVirtualAddressMap(). Setup is executed before
|
||||
* ExitBootServices() while execute is executed after
|
||||
* ExitBootServices(), and after the execute of tests marked as
|
||||
* @EFI_SETUP_BEFORE_BOOTTIME_EXIT. Teardown is executed thereafter.
|
||||
*/
|
||||
EFI_SETTING_VIRTUAL_ADDRESS_MAP,
|
||||
};
|
||||
|
||||
@@ -219,6 +219,10 @@
|
||||
*
|
||||
* This is like ll_entry_get(), but without the extra code, so it is suitable
|
||||
* for putting into data structures.
|
||||
*
|
||||
* @_type: C type of the list entry, e.g. 'struct foo'
|
||||
* @_name: name of the entry
|
||||
* @_list: name of the list
|
||||
*/
|
||||
#define ll_entry_ref(_type, _name, _list) \
|
||||
((_type *)&_u_boot_list_2_##_list##_2_##_name)
|
||||
|
||||
Reference in New Issue
Block a user