diff options
| author | Tom Rini <[email protected]> | 2024-07-31 07:20:32 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-07-31 07:20:32 -0600 |
| commit | 4793b683b3ae4aaad9785c36e1d9cc71613a4253 (patch) | |
| tree | fd6bf04ca23dc979e4ec580d569c95f77dd68b01 /include | |
| parent | 8877bc51a8a4d921ba2f163208b8b1a57ba47c18 (diff) | |
| parent | 939afc80b6b5de23d70789f3cb3a391dd31319b1 (diff) | |
Merge tag 'efi-2024-10-rc2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request efi-2024-10-rc2
Documentation:
* Add a description for bootmeth_android
UEFI:
* Provide and use function list_count_nodes()
* Require EFI boot manager for EBBR compliance
* Correct check in efi_load_option_dp_join()
* Adjust config options for capsule updates
SMBIOS:
* Add extended Extended BIOS ROM Size
Diffstat (limited to 'include')
| -rw-r--r-- | include/dm/util.h | 8 | ||||
| -rw-r--r-- | include/linux/list.h | 15 | ||||
| -rw-r--r-- | include/smbios.h | 1 |
3 files changed, 16 insertions, 8 deletions
diff --git a/include/dm/util.h b/include/dm/util.h index 95c3527a37c..ec518c51d93 100644 --- a/include/dm/util.h +++ b/include/dm/util.h @@ -17,14 +17,6 @@ struct dm_stats; struct list_head; /** - * list_count_items() - Count number of items in a list - * - * @param head: Head of list - * Return: number of items, or 0 if empty - */ -int list_count_items(struct list_head *head); - -/** * Dump out a tree of all devices starting @uclass * * @dev_name: udevice name diff --git a/include/linux/list.h b/include/linux/list.h index 6910721c005..0f9d939b05f 100644 --- a/include/linux/list.h +++ b/include/linux/list.h @@ -547,6 +547,21 @@ static inline void list_splice_tail_init(struct list_head *list, &pos->member != (head); \ pos = n, n = list_entry(n->member.prev, typeof(*n), member)) +/** + * list_count_nodes - count nodes in the list + * @head: the head for your list. + */ +static inline size_t list_count_nodes(struct list_head *head) +{ + struct list_head *pos; + size_t count = 0; + + list_for_each(pos, head) + count++; + + return count; +} + /* * Double linked lists with a single pointer list head. * Mostly useful for hash tables where the two pointer list head is diff --git a/include/smbios.h b/include/smbios.h index a4fda9df7bd..00119d7a60c 100644 --- a/include/smbios.h +++ b/include/smbios.h @@ -105,6 +105,7 @@ struct __packed smbios_type0 { u8 bios_minor_release; u8 ec_major_release; u8 ec_minor_release; + u16 extended_bios_rom_size; char eos[SMBIOS_STRUCT_EOS_BYTES]; }; |