diff options
| author | Tom Rini <trini@konsulko.com> | 2021-07-24 16:41:25 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-07-24 16:41:25 -0400 |
| commit | ec22c365e3d21c8a5c20413d537042527b33a6cf (patch) | |
| tree | 06a613b648aafcc6b35e195cab65f366b6f38e7f /include | |
| parent | 7d4ce5ea53bdf4be8a951154c65ceef4b389fea7 (diff) | |
| parent | d75f48a83dc4998a49a4c35e80a9eab91566df30 (diff) | |
Merge tag 'efi-2021-10-rc1-3' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2021-10-rc1-3
Documentation:
provide Makefile documentation
SMBIOS:
generate BIOS release date based on UEFI version
improve error handling in SMBIOS table generation
UEFI:
correct handling of signed capsule if authentication if off
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi_api.h | 4 | ||||
| -rw-r--r-- | include/efi_loader.h | 1 | ||||
| -rw-r--r-- | include/smbios.h | 7 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/efi_api.h b/include/efi_api.h index 18a1adf023..e854a8b3a1 100644 --- a/include/efi_api.h +++ b/include/efi_api.h @@ -20,10 +20,6 @@ #include <charset.h> #include <pe.h> -#ifdef CONFIG_EFI_LOADER -#include <asm/setjmp.h> -#endif - /* UEFI spec version 2.8 */ #define EFI_SPECIFICATION_VERSION (2 << 16 | 80) diff --git a/include/efi_loader.h b/include/efi_loader.h index b81180cfda..e6d41cfb35 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -17,6 +17,7 @@ #include <pe.h> struct blk_desc; +struct jmp_buf_data; static inline int guidcmp(const void *g1, const void *g2) { diff --git a/include/smbios.h b/include/smbios.h index fc49fc10b9..aa6b6f3849 100644 --- a/include/smbios.h +++ b/include/smbios.h @@ -229,8 +229,11 @@ static inline void fill_smbios_header(void *table, int type, * This writes SMBIOS table at a given address. * * @addr: start address to write SMBIOS table. If this is not - * 16-byte-aligned then it will be aligned before the table is written - * @return: end address of SMBIOS table (and start address for next entry) + * 16-byte-aligned then it will be aligned before the table is + * written. + * Return: end address of SMBIOS table (and start address for next entry) + * or NULL in case of an error + * */ ulong write_smbios_table(ulong addr); |