diff options
author | Tom Rini <trini@konsulko.com> | 2020-01-15 12:29:23 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-01-15 12:29:23 -0500 |
commit | 9d5d74c3ccdc78bac969d25e98eab96872e33b5c (patch) | |
tree | f2793e4d1149b228e9ee2d04a67f2aae0a804ea7 /lib/efi_loader/efi_boottime.c | |
parent | fb537657d9e94a8d489eb9463451e9cf90cbe973 (diff) | |
parent | faadc04180ef05acfd6523b49a2abf37ae61afad (diff) |
Merge tag 'efi-2020-04-rc1-2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi
Pull request for UEFI sub-system for efi-2020-04-rc1-2
Bug fixes for the UEFI sub-system are provided:
* imply VIDEO_ANSI for correct cursor positioning and colors
* fix issues in the UEFI block device driver
* add missing documentation
Diffstat (limited to 'lib/efi_loader/efi_boottime.c')
-rw-r--r-- | lib/efi_loader/efi_boottime.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 3103a50158..1f598b357a 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -2933,10 +2933,10 @@ efi_status_t EFIAPI efi_start_image(efi_handle_t image_handle, ret = EFI_CALL(image_obj->entry(image_handle, &systab)); /* - * Usually UEFI applications call Exit() instead of returning. - * But because the world doesn't consist of ponies and unicorns, - * we're happy to emulate that behavior on behalf of a payload - * that forgot. + * Control is returned from a started UEFI image either by calling + * Exit() (where exit data can be provided) or by simply returning from + * the entry point. In the latter case call Exit() on behalf of the + * image. */ return EFI_CALL(systab.boottime->exit(image_handle, ret, 0, NULL)); } |