diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-26 17:10:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-26 17:10:53 -0500 |
| commit | 693650b15d04cd5a5861bd3136c9ed9e23f95c41 (patch) | |
| tree | b4a3b3ca5d9b6b6f10e3d6880f1caa17219776c2 /arch/sandbox/cpu/start.c | |
| parent | 2ad8d0cb950da2233a2ec030533f4e54c6d04126 (diff) | |
| parent | 2b5e7108594d4e100c88f44353d1fed6456d6471 (diff) | |
Merge tag 'efi-2022-01-rc3-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-01-rc3-2
Test:
* fix pylint warnings
UEFI:
* disable interrupts before removing devices in ExitBootServices()
* implement poweroff in efi_system_reset() on sandbox
* allow booting via EFI even if some block device fails
Diffstat (limited to 'arch/sandbox/cpu/start.c')
| -rw-r--r-- | arch/sandbox/cpu/start.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index a74f5ec7ba..13b0731ec3 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -434,8 +434,10 @@ void __efi_runtime EFIAPI efi_reset_system( efi_status_t reset_status, unsigned long data_size, void *reset_data) { - os_fd_restore(); - os_relaunch(os_argv); + if (reset_type == EFI_RESET_SHUTDOWN) + sandbox_exit(); + else + sandbox_reset(); } void sandbox_reset(void) |