openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

efi/arm64: efistub: Move shared dependencies to <asm/efi.h> 

This moves definitions depended upon both by code under arch/arm64/boot
and under drivers/firmware/efi to <asm/efi.h>. This is in preparation of
turning the stub code under drivers/firmware/efi into a static library.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
This commit is contained in:
Ard Biesheuvel 2014-07-02 14:54:41 +02:00 committed by Matt Fleming
parent f23cf8bd5c
commit a13b00778e
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm64/include/asm/efi.h
View File

@ -32,4 +32,16 @@ extern void efi_idmap_init(void);
kernel_neon_end(); \ kernel_neon_end(); \
}) })
/* arch specific definitions used by the stub code */
/*
* AArch64 requires the DTB to be 8-byte aligned in the first 512MiB from
* start of kernel and may not cross a 2MiB boundary. We set alignment to
* 2MiB so we know it won't cross a 2MiB boundary.
*/
#define EFI_FDT_ALIGN SZ_2M /* used by allocate_new_fdt_and_exit_boot() */
#define MAX_FDT_OFFSET SZ_512M
#define efi_call_early(f, ...) sys_table_arg->boottime->f(__VA_ARGS__)
#endif /* _ASM_EFI_H */ #endif /* _ASM_EFI_H */

11
arch/arm64/kernel/efi-stub.c
View File

@ -10,19 +10,10 @@
* *
*/ */
#include <linux/efi.h> #include <linux/efi.h>
#include <asm/efi.h>
#include <linux/libfdt.h> #include <linux/libfdt.h>
#include <asm/sections.h> #include <asm/sections.h>
/*
* AArch64 requires the DTB to be 8-byte aligned in the first 512MiB from
* start of kernel and may not cross a 2MiB boundary. We set alignment to
* 2MiB so we know it won't cross a 2MiB boundary.
*/
#define EFI_FDT_ALIGN SZ_2M /* used by allocate_new_fdt_and_exit_boot() */
#define MAX_FDT_OFFSET SZ_512M
#define efi_call_early(f, ...) sys_table_arg->boottime->f(__VA_ARGS__)
static void efi_char16_printk(efi_system_table_t *sys_table_arg, static void efi_char16_printk(efi_system_table_t *sys_table_arg,
efi_char16_t *str); efi_char16_t *str);