Skip to content
Snippets Groups Projects
Commit 3eb0841b authored by Heinrich Schuchardt's avatar Heinrich Schuchardt Committed by Alexander Graf
Browse files

efi_loader: consistently use efi_status_t in bootefi


Where ulong or unsigned long are used to hold an EFI status
code we should consistenly use efi_status_t.

Signed-off-by: default avatarHeinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
parent cd9e18de
No related branches found
No related tags found
No related merge requests found
...@@ -93,10 +93,10 @@ static void *copy_fdt(void *fdt) ...@@ -93,10 +93,10 @@ static void *copy_fdt(void *fdt)
return new_fdt; return new_fdt;
} }
static ulong efi_do_enter(void *image_handle, static efi_status_t efi_do_enter(
struct efi_system_table *st, void *image_handle, struct efi_system_table *st,
asmlinkage ulong (*entry)(void *image_handle, asmlinkage ulong (*entry)(void *image_handle,
struct efi_system_table *st)) struct efi_system_table *st))
{ {
efi_status_t ret = EFI_LOAD_ERROR; efi_status_t ret = EFI_LOAD_ERROR;
...@@ -107,7 +107,7 @@ static ulong efi_do_enter(void *image_handle, ...@@ -107,7 +107,7 @@ static ulong efi_do_enter(void *image_handle,
} }
#ifdef CONFIG_ARM64 #ifdef CONFIG_ARM64
static unsigned long efi_run_in_el2(asmlinkage ulong (*entry)( static efi_status_t efi_run_in_el2(asmlinkage ulong (*entry)(
void *image_handle, struct efi_system_table *st), void *image_handle, struct efi_system_table *st),
void *image_handle, struct efi_system_table *st) void *image_handle, struct efi_system_table *st)
{ {
...@@ -122,9 +122,9 @@ static unsigned long efi_run_in_el2(asmlinkage ulong (*entry)( ...@@ -122,9 +122,9 @@ static unsigned long efi_run_in_el2(asmlinkage ulong (*entry)(
* Load an EFI payload into a newly allocated piece of memory, register all * Load an EFI payload into a newly allocated piece of memory, register all
* EFI objects it would want to access and jump to it. * EFI objects it would want to access and jump to it.
*/ */
static unsigned long do_bootefi_exec(void *efi, void *fdt, static efi_status_t do_bootefi_exec(void *efi, void *fdt,
struct efi_device_path *device_path, struct efi_device_path *device_path,
struct efi_device_path *image_path) struct efi_device_path *image_path)
{ {
struct efi_loaded_image loaded_image_info = {}; struct efi_loaded_image loaded_image_info = {};
struct efi_object loaded_image_info_obj = {}; struct efi_object loaded_image_info_obj = {};
...@@ -278,7 +278,7 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ...@@ -278,7 +278,7 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{ {
char *saddr, *sfdt; char *saddr, *sfdt;
unsigned long addr, fdt_addr = 0; unsigned long addr, fdt_addr = 0;
unsigned long r; efi_status_t r;
if (argc < 2) if (argc < 2)
return CMD_RET_USAGE; return CMD_RET_USAGE;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment