diff options
| author | Heinrich Schuchardt <xypron.glpk@gmx.de> | 2017-11-26 14:05:22 +0100 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2017-12-01 13:40:07 +0100 |
| commit | ea54ad59286efe7e600f3e189036fa96989eace4 (patch) | |
| tree | 93a77bf4fffda1c30f16554bc685127b2861b894 /cmd | |
| parent | 45055aac9dad8d08f8691d7d5b116c23ad07a50d (diff) | |
| download | u-boot-ea54ad59286efe7e600f3e189036fa96989eace4.zip u-boot-ea54ad59286efe7e600f3e189036fa96989eace4.tar.gz u-boot-ea54ad59286efe7e600f3e189036fa96989eace4.tar.bz2 | |
efi_loader: pass handle of loaded image
The handle of a loaded image is the value of the handle
member of the loaded image info object and not the
address of the loaded image info.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/bootefi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmd/bootefi.c b/cmd/bootefi.c index aa754b7..78ff109 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -254,7 +254,8 @@ static efi_status_t do_bootefi_exec(void *efi, void *fdt, dcache_disable(); /* flush cache before switch to EL2 */ /* Move into EL2 and keep running there */ - armv8_switch_to_el2((ulong)entry, (ulong)&loaded_image_info, + armv8_switch_to_el2((ulong)entry, + (ulong)&loaded_image_info_obj.handle, (ulong)&systab, 0, (ulong)efi_run_in_el2, ES_TO_AARCH64); @@ -263,7 +264,7 @@ static efi_status_t do_bootefi_exec(void *efi, void *fdt, } #endif - ret = efi_do_enter(&loaded_image_info, &systab, entry); + ret = efi_do_enter(loaded_image_info_obj.handle, &systab, entry); exit: /* image has returned, loaded-image obj goes *poof*: */ @@ -350,7 +351,7 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* Transfer environment variable efi_selftest as load options */ set_load_options(&loaded_image_info, "efi_selftest"); /* Execute the test */ - r = efi_selftest(&loaded_image_info, &systab); + r = efi_selftest(loaded_image_info_obj.handle, &systab); efi_restore_gd(); free(loaded_image_info.load_options); list_del(&loaded_image_info_obj.link); |