diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-18 18:24:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-18 18:24:58 -0400 |
| commit | 5619295995e3262bb5770e8b5e945ffdc5442145 (patch) | |
| tree | 6ba37499aeb10145237379ac9c54dd01ea5aaf3b /include | |
| parent | 1fdafb2e3dfecdc4129a8062ad25b1adb32b0efb (diff) | |
| parent | c81883dfce7360148c72922b93bfa16b399ee3ee (diff) | |
| download | u-boot-5619295995e3262bb5770e8b5e945ffdc5442145.zip u-boot-5619295995e3262bb5770e8b5e945ffdc5442145.tar.gz u-boot-5619295995e3262bb5770e8b5e945ffdc5442145.tar.bz2 | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
EFI Fixes for 2017.09:
- Fix GOP w/o display
- Fix LocateHandle
- Fix exit return value truncation
- Fix missing EFIAPI in efi_locate_handle (for x86)
Diffstat (limited to 'include')
| -rw-r--r-- | include/efi_loader.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/efi_loader.h b/include/efi_loader.h index 037cc7c..1179234 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -33,9 +33,9 @@ const char *__efi_nesting_dec(void); * Exit the u-boot world back to UEFI: */ #define EFI_EXIT(ret) ({ \ - efi_status_t _r = ret; \ + typeof(ret) _r = ret; \ debug("%sEFI: Exit: %s: %u\n", __efi_nesting_dec(), \ - __func__, (u32)(_r & ~EFI_ERROR_MASK)); \ + __func__, (u32)((uintptr_t) _r & ~EFI_ERROR_MASK)); \ assert(__efi_exit_check()); \ _r; \ }) |