diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-13 09:26:04 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-02-13 09:26:04 +0100 |
| commit | bb1a6a2fd3cc41be6db1a1362f311456019317b1 (patch) | |
| tree | 72db0cbebe64670f6858e3a9955a62f1b6213299 /arch/efi/efi/efi-image.c | |
| parent | a06513273fc18c16b5081ddd80ce14b7de37cf6e (diff) | |
| parent | aa6f3cc4b46c90c485aed7e183199871348c4821 (diff) | |
| download | barebox-bb1a6a2fd3cc41be6db1a1362f311456019317b1.tar.gz barebox-bb1a6a2fd3cc41be6db1a1362f311456019317b1.tar.xz | |
Merge branch 'for-next/efi'
Diffstat (limited to 'arch/efi/efi/efi-image.c')
| -rw-r--r-- | arch/efi/efi/efi-image.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/efi/efi/efi-image.c b/arch/efi/efi/efi-image.c index 32e060886a..27f3c1b39c 100644 --- a/arch/efi/efi/efi-image.c +++ b/arch/efi/efi/efi-image.c @@ -130,12 +130,16 @@ static int efi_execute_image(const char *file) efi_status_t efiret; struct linux_kernel_header *image_header; const char *options; + bool is_driver; int ret; ret = efi_load_image(file, &loaded_image, &handle); if (ret) return ret; + is_driver = (loaded_image->image_code_type == EFI_BOOT_SERVICES_CODE) || + (loaded_image->image_code_type == EFI_RUNTIME_SERVICES_CODE); + image_header = (struct linux_kernel_header *)loaded_image->image_base; if (image_header->boot_flag == 0xAA55 && image_header->header == 0x53726448) { @@ -145,13 +149,15 @@ static int efi_execute_image(const char *file) loaded_image->load_options = xstrdup_char_to_wchar(options); loaded_image->load_options_size = (strlen(options) + 1) * sizeof(wchar_t); + shutdown_barebox(); } efiret = BS->start_image(handle, NULL, NULL); if (EFI_ERROR(efiret)) pr_err("failed to StartImage: %s\n", efi_strerror(efiret)); - BS->unload_image(handle); + if (!is_driver) + BS->unload_image(handle); efi_connect_all(); efi_register_devices(); @@ -255,6 +261,7 @@ static int do_bootm_efi(struct image_data *data) efi_set_variable_usec("LoaderTimeExecUSec", &efi_systemd_vendor_guid, get_time_ns()/1000); + shutdown_barebox(); linux_efi_handover(handle, boot_header); return 0; |