diff options
| author | Tom Rini <[email protected]> | 2026-05-06 08:45:57 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-05-06 08:45:57 -0600 |
| commit | 8399b039b038e72ff51640c61dd762f3368306f5 (patch) | |
| tree | 7e867e3b37c9ddc9837c3417b1362d3bd84c247e /include | |
| parent | 980f8a4589626ca2b9c6c5f74eefe72f4b5606c6 (diff) | |
| parent | b1c28ad5fafd95c183b26165e498354db41b755b (diff) | |
Merge tag 'efi-2026-07-rc2-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2026-07-rc2-2
CI: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/29993
UEFI:
* initialize variables in efi_dp_from_http()
* cmd: eficonfig: adjust struct eficonfig_entry, field key
* efi_dt_fixup: use fdtdec_get_bool() for reading boolean no-map property
* efi_selftest_memory: check for duplicates first
* simplify efi_mem_sort() using list_for_each_entry_safe
Others:
* lmb: document allocation flags constants
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi_config.h | 4 | ||||
| -rw-r--r-- | include/lmb.h | 30 |
2 files changed, 27 insertions, 7 deletions
diff --git a/include/efi_config.h b/include/efi_config.h index 23211e799fc..bff77a5f961 100644 --- a/include/efi_config.h +++ b/include/efi_config.h @@ -24,7 +24,7 @@ typedef efi_status_t (*eficonfig_entry_func)(void *data); * * @num: menu entry index * @title: title of entry - * @key: unique key + * @key: unique key, takes a number up to EFICONFIG_ENTRY_NUM_MAX - 1 * @efi_menu: pointer to the menu structure * @func: callback function to be called when this entry is selected * @data: data to be passed to the callback function, caller must free() this pointer @@ -33,7 +33,7 @@ typedef efi_status_t (*eficonfig_entry_func)(void *data); struct eficonfig_entry { u32 num; char *title; - char key[3]; + char key[11]; struct efimenu *efi_menu; eficonfig_entry_func func; void *data; diff --git a/include/lmb.h b/include/lmb.h index 5d5f037ccb9..ed472e9ef2e 100644 --- a/include/lmb.h +++ b/include/lmb.h @@ -19,16 +19,36 @@ #define LMB_ALIST_INITIAL_SIZE 4 /** - * DOC: Memory region attribute flags. + * define LMB_NONE - no special request * - * %LMB_NONE: No special request - * %LMB_NOMAP: Don't add to MMU configuration - * %LMB_NOOVERWRITE: The memory region cannot be overwritten/re-reserved - * %LMB_NONOTIFY: Do not notify other modules of changes to this memory region + * LMB Memory region attribute flag to indicate that there are no special + * requests for this region. Normally used as a placeholder value. */ #define LMB_NONE 0 + +/** + * define LMB_NOMAP - do not add to MMU configuration + * + * LMB Memory region attribute flag to indicate that the region will not be + * mapped by LMB. Normally used for reserved regions. + */ #define LMB_NOMAP BIT(1) + +/** + * define LMB_NOOVERWRITE - do not overwrite/re-reserve + * + * LMB Memory region attribute flag to indicate that the region will not be + * overwritten or re-reserved. Normally used for reserved regions. + */ #define LMB_NOOVERWRITE BIT(2) + +/** + * define LMB_NONOTIFY - do not notify other modules of changes + * + * LMB Memory region attribute flag to indicate that the region will not notify + * downstream allocators (currently just the EFI allocator) of changes to this + * region through lmb_map_update_notify(). + */ #define LMB_NONOTIFY BIT(3) /** |