From: Heinrich Schuchardt Date: Wed, 20 Sep 2017 20:54:58 +0000 (+0200) Subject: efi_loader: reenable selftest X-Git-Tag: v2017.11-rc1~4^2~1 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7aca68ca06b8a96cb71f690e24f990281e402be8;p=u-boot efi_loader: reenable selftest ad503ffe9c6 efi_loader: refactor boot device and loaded_image handling leads to an error when building with CONFIG_CMD_BOOTEFI_SELFTEST=y This patch fixes the problem. Fixes: ad503ffe9c6 efi_loader: refactor boot device and loaded_image handling Signed-off-by: Heinrich Schuchardt Reviewed-by: Rob Clark Signed-off-by: Alexander Graf --- diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 1e2dbcc4a4..e0a657323f 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -273,6 +273,12 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif #ifdef CONFIG_CMD_BOOTEFI_SELFTEST if (!strcmp(argv[1], "selftest")) { + struct efi_loaded_image loaded_image_info = {}; + struct efi_object loaded_image_info_obj = {}; + + efi_setup_loaded_image(&loaded_image_info, + &loaded_image_info_obj, + bootefi_device_path, bootefi_image_path); /* * gd lives in a fixed register which may get clobbered while we * execute the payload. So save it here and restore it on every @@ -282,8 +288,6 @@ static int do_bootefi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* Initialize and populate EFI object list */ if (!efi_obj_list_initalized) efi_init_obj_list(); - loaded_image_info.device_handle = bootefi_device_path; - loaded_image_info.file_path = bootefi_image_path; return efi_selftest(&loaded_image_info, &systab); } else #endif