diff options
| author | Tom Rini <trini@konsulko.com> | 2016-11-17 16:46:45 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-11-17 16:46:45 (GMT) |
| commit | 9e40ea04e9f1a70a184504c9e2beb051eb2d9335 (patch) | |
| tree | dddf5ab6a2ce464955233c7ae542ec102bb12050 /include/efi_loader.h | |
| parent | 688d1be5ba63be281c2894e74b27209133598e2e (diff) | |
| parent | b99ebaf9f01ebe864061818e00beb70cb1ddc635 (diff) | |
| download | u-boot-9e40ea04e9f1a70a184504c9e2beb051eb2d9335.tar.xz | |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2016-11-17
Highlights this time around:
- x86 efi_loader support
- hello world efi test case
- network device name is now representative
- terminal output reports modes correctly
- fix psci reset for ls1043/ls1046
- fix efi_add_runtime_mmio definition for x86
- efi_loader support for ls2080
Diffstat (limited to 'include/efi_loader.h')
| -rw-r--r-- | include/efi_loader.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/efi_loader.h b/include/efi_loader.h index 35b3fe2..99619f5 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -181,7 +181,7 @@ void efi_get_time_init(void); /* Without CONFIG_EFI_LOADER we don't have a runtime section, stub it out */ #define __efi_runtime_data #define __efi_runtime -static inline void efi_add_runtime_mmio(void **mmio_ptr, u64 len) { } +static inline void efi_add_runtime_mmio(void *mmio_ptr, u64 len) { } /* No loader configured, stub out EFI_ENTRY */ static inline void efi_restore_gd(void) { } |