diff options
| author | Roy Franz <roy.franz@linaro.org> | 2013-09-22 15:45:26 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-08 20:20:24 +0100 |
| commit | e56a7353e01997bfd2c4ef53a3126767ef22ac15 (patch) | |
| tree | 960cfd8ebc58fc91e012753b937b29e6b895154c | |
| parent | c6a99bb2c26a0ca26bf3e732172673337ed0bc79 (diff) | |
efi: Add proper definitions for some EFI function pointers.
The x86/AMD64 EFI stubs must use a call wrapper to convert between
the Linux and EFI ABIs, so void pointers are sufficient. For ARM,
the ABIs are compatible, so we can directly invoke the function
pointers. The functions that are used by the ARM stub are updated
to match the EFI definitions.
Also add some EFI types used by EFI functions.
Signed-off-by: Roy Franz <roy.franz@linaro.org>
Acked-by: Mark Salter <msalter@redhat.com>
Reviewed-by: Grant Likely <grant.likely@linaro.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
(cherry picked from commit ed37ddffe201bfad7be3c45bc08bd65b5298adca)
Signed-off-by: Mark Brown <broonie@linaro.org>
Conflicts:
arch/x86/boot/compressed/eboot.h
| -rw-r--r-- | arch/x86/boot/compressed/eboot.h | 1 | ||||
| -rw-r--r-- | include/linux/efi.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/eboot.h b/arch/x86/boot/compressed/eboot.h index 81b6b652b46a..02265107cce3 100644 --- a/arch/x86/boot/compressed/eboot.h +++ b/arch/x86/boot/compressed/eboot.h @@ -10,6 +10,7 @@ #define SEG_GRANULARITY_4KB (1 << 0) #define DESC_TYPE_CODE_DATA (1 << 0) +#define EFI_READ_CHUNK_SIZE (1024 * 1024) #define EFI_CONSOLE_OUT_DEVICE_GUID \ EFI_GUID(0xd3b36f2c, 0xd551, 0x11d4, 0x9a, 0x46, 0x0, 0x90, 0x27, \ diff --git a/include/linux/efi.h b/include/linux/efi.h index a50bf34c041b..048ee805dfc5 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -834,6 +834,7 @@ struct efi_simple_text_output_protocol { void *test_string; }; + extern struct list_head efivar_sysfs_list; static inline void |